git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Is there a way to cherry-pick a merge?

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 14, 2013, 21:54 UTC
Message-ID
<7vobb8mk7z.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130614213656.6813.qmail@science.horizon.com>
"George Spelvin" <linux@horizon.com> writes:
Show 10 quoted lines
> "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.

In the meantime, "git commit --amend -C commit" would be a workaround, I would guess.

Previous: George SpelvinNext: George Spelvin
Message 4 of 5 in “Is there a way to cherry-pick a merge?”
  1. George SpelvinJun 14, 2013
  2. Junio C HamanoJun 14, 2013
  3. George SpelvinJun 14, 2013
  4. Junio C HamanoJun 14, 2013
  5. George SpelvinJun 15, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.