From 8b9c72584bf45f95cab2a71795853adccbaa7906 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 9 May 2024 09:31:24 +0200
Subject: [PATCH] merge_upstream.sh: Do not recreate patches by default

---
 merge_upstream.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/merge_upstream.sh b/merge_upstream.sh
index 2e58aaf..d293e31 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -4,11 +4,12 @@ set -e
 
 mydir="$(dirname "$(realpath "$0")")"
 
-if [ "$1" = "-k" ]; then
-    keep_patches=1
+# Update patches?
+if [ "$1" = "-u" ]; then
+    keep_patches=0
     shift
 else
-    keep_patches=0
+    keep_patches=1
 fi
 
 pushd "$mydir" > /dev/null