@matheusbsbs / matheus-bagliano / commits / a6ec3c1599
Fork 0

git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.

This reduces the number of conflicts when rebasing after a series of patches to the same piece of code is committed upstream. Signed-off-by: Robert Shearman <rob@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Robert Shearman committed Oct 3, 2006 at 17:29 UTC a6ec3c1599f990b4f2f3dab2606688639f74d844
1 file changed +1 -1
git-rebase.sh
+1 -1
@@ -286,7 +286,7 @@ fi
286
287 if test -z "$do_merge"
288 then
289 - git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD |
289 + git-format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
290 git am --binary -3 -k --resolvemsg="$RESOLVEMSG" \
291 --reflog-action=rebase
292 exit $?