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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 14, 2013, 19:44 UTC
Message-ID: <7v7ghwo4u4.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130614193729.17663.qmail@science.horizon.com>

"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"?

$ 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.