Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
author
Robert Shearman
<rob@codeweavers.com>
Tue, 3 Oct 2006 16:29:26 +0000
(17:29 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 4 Oct 2006 22:02:04 +0000
(15:02 -0700)
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>
git-rebase.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
c065b6e
)
diff --git
a/git-rebase.sh
b/git-rebase.sh
index a7373c0532fad447263e7199d0b8ec2908c683c9..413636e2086a8c7274c0bc4cb04037f2e07f588e 100755
(executable)
--- 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 $?