From: Robert Shearman <rob@codeweavers.com>
Date: Tue, 3 Oct 2006 16:29:26 +0000 (+0100)
Subject: git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
X-Git-Tag: v1.4.4-rc1~91^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=91b489776c25866568c081e8cf4ae83fa41f8707;p=git.git

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>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index a7373c053..413636e20 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -286,7 +286,7 @@ fi
 
 if test -z "$do_merge"
 then
-	git-format-patch -k --stdout --full-index "$upstream"..ORIG_HEAD |
+	git-format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
 	git am --binary -3 -k --resolvemsg="$RESOLVEMSG" \
 		--reflog-action=rebase
 	exit $?