Update git-up to use rebase-merges instead of preserve-merges

m14t · Jul 31, 2024 · 487d4f3 · 487d4f3
1 parent a1d7dcd
commit 487d4f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-up b/git-up
@@ -15,4 +15,4 @@ fi
 git fetch origin $TARGET:$TARGET
 
 # Rebase against target branch, automatically stashing and unstashing
-git rebase --preserve-merges --autostash "$TARGET"
+git rebase --rebase-merges --autostash "$TARGET"