From: Robert Shearman <rob@codeweavers.com>
Date: Tue, 03 Oct 2006 16:29:26 GMT
Subject: [PATCH] git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
Message-ID: <45228FE6.5060206@codeweavers.com>


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>
---
  git-rebase.sh |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/git-rebase.sh b/git-rebase.sh
index a7373c0..413636e 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 $?