* [PATCH] git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
@ 2006-10-03 16:29 Robert Shearman
0 siblings, 0 replies; only message in thread
From: Robert Shearman @ 2006-10-03 16:29 UTC (permalink / raw)
To: Git Mailing List
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
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(-)
[-- Attachment #2: b751c3c0da70a7b1dfddb5dd42412f1d2f1cc73d.diff --]
[-- Type: text/x-patch, Size: 420 bytes --]
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 $?
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-10-03 16:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-03 16:29 [PATCH] git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch Robert Shearman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).