From: Robert Shearman <rob@codeweavers.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
Date: Tue, 03 Oct 2006 17:29:26 +0100 [thread overview]
Message-ID: <45228FE6.5060206@codeweavers.com> (raw)
[-- 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 $?
reply other threads:[~2006-10-03 16:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45228FE6.5060206@codeweavers.com \
--to=rob@codeweavers.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).