From: "George Spelvin" <linux@horizon.com>
To: gitster@pobox.com, linux@horizon.com
Cc: git@vger.kernel.org
Subject: Re: Is there a way to cherry-pick a merge?
Date: 14 Jun 2013 17:36:56 -0400 [thread overview]
Message-ID: <20130614213656.6813.qmail@science.horizon.com> (raw)
In-Reply-To: <7v7ghwo4u4.fsf@alter.siamese.dyndns.org>
"George Spelvin" <linux@horizon.com> writes:
>> Sometimes I'd like to repeat a previously performed merge, preserving
>> the commit message. And, if possible, the conflict resolutions.
>
> Is it "git merge commit^2"?
I suppose that was an obvious one to leave out of my alternatives list.
This is what I've been doing, but it requires I cut and paste the commit
message. Preserving timestamps, author, etc. is even more awkward.
That's why I've been looking for an alternative.
next prev parent reply other threads:[~2013-06-14 21:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-14 19:37 Is there a way to cherry-pick a merge? George Spelvin
2013-06-14 19:44 ` Junio C Hamano
2013-06-14 21:36 ` George Spelvin [this message]
2013-06-14 21:54 ` Junio C Hamano
2013-06-15 3:03 ` George Spelvin
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=20130614213656.6813.qmail@science.horizon.com \
--to=linux@horizon.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).