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

Re: [PATCH] Documentation: 'cherry' does not cope well with merges from upstream

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jul 2, 2010, 01:04 UTC
Message-ID
<20100702010400.GA6058@burratino>
In-Reply-To
<20100701210919.GA4283@burratino>
Jonathan Nieder wrote:
Show 12 quoted lines
> +'git cherry' does not cope well with merges from upstream on the
> +working branch.  Any commits after the original fork point and
> +before the latest merge from upstream will be reported as not found
> +in <upstream>.
> +
> +                       ____*____*____*_____*__> <upstream>
> +                      /                     \
> +   original fork point                       \
> +                      \__+__+__+__+__+__+__+__*_> <head>
> +
> +While these commits are part of upstream..head, their upstream
> +counterparts are not in head..upstream.

As Junio mentioned, the text and diagram are hard to reconcile since “these commits” are not clearly explained to be “the commits after the original fork point and before the latest merge, marked with a +”.

Actually, the whole text is kind of awkward, which is why I left this hanging for so long[1]. Sorry.

Adding “(marked +)” after “these commits” sounds reasonable to me as a quick fix.

[1] http://bugs.debian.org/575577
Previous: Jonathan NiederNext: Michael J Gruber
Message 10 of 13 in “git cherry not marking commits with equivalent upstream”
  1. Andrew PimlottJul 1, 2010
  2. Andrew PimlottJul 1, 2010
  3. Björn SteinbrinkJul 1, 2010
  4. Andrew PimlottJul 1, 2010
  5. Documentation: 'cherry' does not cope well with merges from upstreamJonathan Nieder, Jul 1, 2010
  6. Andrew PimlottJul 1, 2010
  7. Jonathan NiederJul 1, 2010
  8. Junio C HamanoJul 1, 2010
  9. Jonathan NiederJul 2, 2010
  10. Jonathan NiederJul 2, 2010
  11. Michael J GruberJul 2, 2010
  12. Jonathan NiederJul 2, 2010
  13. Michael J GruberJul 2, 2010

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.