From: "Pádraig Brady" <P@draigBrady.com>
To: git@vger.kernel.org
Subject: git format-patch doesn't exclude merged hunks
Date: Wed, 16 May 2012 16:42:27 +0100 [thread overview]
Message-ID: <4FB3CAE3.6040608@draigBrady.com> (raw)
So I was using `git format-patch` to generate patches for
consumption by patch (as part of an RPM build),
and one of the patches was failing as part of it was
already applied.
It seems like format-patch should exclude bits it's
merge previously, at least as an option.
For reference the two commits in question are:
https://github.com/openstack/nova/commit/7028d66
https://github.com/openstack/nova/commit/26dc6b7
Notice how both make the same change to Authors.
cheers,
Pádraig.
next reply other threads:[~2012-05-16 15:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 15:42 Pádraig Brady [this message]
2012-05-16 18:49 ` git format-patch doesn't exclude merged hunks Junio C Hamano
2012-05-16 19:04 ` Pádraig Brady
2012-05-16 19:12 ` Junio C Hamano
2012-05-16 20:13 ` Pádraig Brady
2012-05-16 22:42 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB3CAE3.6040608@draigBrady.com \
--to=p@draigbrady.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).