#573917 git-cherry --full to not lose sight of merged upstream commits

Package:
git
Source:
git
Description:
fast, scalable, distributed revision control system
Submitter:
Frédéric Brière
Date:
2010-05-15 21:21:42 UTC
Severity:
wishlist
#573917#5
Date:
2010-03-14 23:13:18 UTC
From:
To:
Taking the example given in git-cherry(1), if one were to merge
<upstream> into <head> (as is often done), then git-cherry would now
report that all commits between fork-point and <head> are no longer
found in <upstream>.  This is obviously due to the fact that while these
commits are still part of upstream..head, their upstream counterparts
are no longer in head..upstream.

#573917#10
Date:
2010-03-27 08:44:56 UTC
From:
To:
found 573917 git-core/1:1.7.0.3-1
tags 573917 + upstream
clone 573917 -1
retitle -1 git-cherry.1 needs a BUGS section
retitle 573917 git-cherry --full to take all upstream commits into account
severity 573917 wishlist
thanks

Hi,

Frédéric Brière wrote:

Nice report.  Like many bugs, this has two parts.  The most interesting
part is the documentation bug.

git-cherry.1 doesn’t really warn about this situation.  How about
something like this:

	BUGS

	If one merges <upstream> into <head> (as is often done), then
	git-cherry will report all commits between the old fork-point
        and <head> as no longer found in <upstream>.