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

Re: git cherry not marking commits with equivalent upstream

From
APAndrew Pimlott <andrew@pimlott.net>
Date
Jul 1, 2010, 21:17 UTC
Message-ID
<1278017685-sup-6132@pimlott.net>
In-Reply-To
<20100701204151.GA6354@atjola.homenet>
Excerpts from Björn Steinbrink's message of Thu Jul 01 13:41:51 -0700 2010:
Show 9 quoted lines
> pull = fetch + merge, so your history in "b" looks like this:
> 
>   2 (origin/master)
>  / \
> 1   M (master)
>  \ /
>   3
> 
> So "2" is common to both branches and thus ignored by cherry.

Ok, it's unintuitive to me that 2 is not considered part of the upstream branch just because I've merged it into mine, but that explains it. Thanks!

However, I want to merge commits from upstream regularly and still figure out what unmerged commits I have. So how can I make this use case work? It sounds like I want to make git-cherry check against everything upstream since the fork point, not just what I haven't merged. Would this be hard?

Andrew
Previous: Björn SteinbrinkNext: Jonathan Nieder
Message 4 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.