Re: Difficulty with getting an accurate changelog after cherry-picking and merging.

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

On Wed, 23 Jul 2008, Luuk Paulussen wrote:

> I'm trying to generate an accurate changelog of changes between 2 tags 
> on a branch.  There is a merge between these 2 points which includes 
> changes that were cherry-picked before the start point.  This causes the 
> changelog to show these changes, despite them already existing before 
> the start point of the log.
>
> [...]
> 
> I have tried git-cherry and git-log with --cherry-pick and various 
> things with git-rev-list and git-merge-base.

cherry and --cherry-pick will only skip patches that are on the 
uninteresting side of a "..." range.

I guess that

	$ git log --cherry-pick master...HEAD^

should filter the commits out, but I haven't tried.

> git cherry-pick :/test1

Heh, that is the first time I see :/ in the wild.  I do not use it 
anymore, and in your case, I would have written "git cherry-pick master^4" 
to be more precise (and not accidentally pick up a wrong one).

Ciao,
Dscho