summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorRobert Shearman <rob@codeweavers.com>2006-10-03 17:29:26 +0100
committerJunio C Hamano <junkio@cox.net>2006-10-04 15:02:04 -0700
commit91b489776c25866568c081e8cf4ae83fa41f8707 (patch)
tree5521654b1e5a5c126109733cc1431909b91f3788 /git-rebase.sh
parentc065b6e4293f856012ec53fcff7bf4d47ac50927 (diff)
downloadgit-91b489776c25866568c081e8cf4ae83fa41f8707.tar.gz
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index a7373c0532..413636e208 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 $?