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

PATCH New Robert Shearman 1 participant 1 message Jun 15, 2016

Share & tools

Robert Shearman

author

2016-06-15 22:42 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 git-rebase.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

git-rebase.sh +1 -1

index a7373c0..413636e 100755
@@ -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 $?