diff options
| author | Robert Shearman <rob@codeweavers.com> | 2006-10-03 17:29:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 14:41:16 -0800 |
| commit | a6ec3c1599f990b4f2f3dab2606688639f74d844 (patch) | |
| tree | 67f3995486d87c46256b7cb4566a8b236a85e7f5 | |
| parent | 45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff (diff) | |
| download | git-a6ec3c1599f990b4f2f3dab2606688639f74d844.tar.gz git-a6ec3c1599f990b4f2f3dab2606688639f74d844.tar.xz | |
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>
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 $? |