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

Re: git cherry doesn't list a merge commit

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 13, 2012, 18:57 UTC
Message-ID
<7vaa4mfto2.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4F392976.9070009@intland.com>
Tajti Ákos <akos.tajti@intland.com> writes:
Show 5 quoted lines
> However, the manual of git cherry says:
> "*Every* commit that doesn’t exist in the <upstream> branch has its
> id (sha1) reported, prefixed by a symbol. The ones that have
> equivalent change already in the <upstream> branch are prefixed with a
> minus (-) sign"

The sole purpose of the command is to decide which commits in the existing history to run "format-patch" on to feed the output to "am" to update the other history, and it was clear for both readers and the author of the documentation that a "commit" meant a "non-merge commit" in that context.

A patch to rephrase it to "every non-merge commit" for clarity may not be useless, though.

Previous: Tajti Ákos
Message 2 of 2 in “git cherry doesn't list a merge commit”
  1. Tajti ÁkosFeb 13, 2012
  2. Junio C HamanoFeb 13, 2012

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.