Excerpts from Björn Steinbrink's message of Thu Jul 01 13:41:51 -0700 2010:
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