From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 Apr 2008 19:13:43 GMT
Subject: Re: my git problem
Message-ID: <alpine.DEB.1.00.0804282012140.19187@eeepc-johanness>
In-Reply-To: <20080428120917.dd9f01e8.akpm@linux-foundation.org>

Hi,

On Mon, 28 Apr 2008, Andrew Morton wrote:

> On Mon, 28 Apr 2008 19:49:28 +0100 (BST) Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 
> > On Mon, 28 Apr 2008, Andrew Morton wrote:
> > 
> > > hm, weirdness.
> > > 
> > > y:/usr/src/git26> git-diff origin...git-ia64   
> > > y:/usr/src/git26> git-log origin...git-ia64 | wc -l
> > > 15574
> > > 
> > > I'd have expected git-log to operate on the same patches as git-diff.
> > > 
> > > I'm sure there's a logical explanation for this ;)
> > 
> > Yes.  git-diff with "..." will show you the diff of git-ia64 since the 
> > branch point, whereas log will show you _all_ the logs (both in origin and 
> > in git-ia64) since the branch point.
> > 
> 
> That's missing the "logical" bit :)

Heh, you're right.  I am too used to Git to think how other people would 
feel about these things... :-)

> Oh well.  Can you suggest how I can extract the changelogs for the 
> patches which `git-diff origin...git-ia64' will print out?

I think you get what you want with

	$ git-log --cherry-pick origin...git-ia64

(although I might be wrong on the order of origin and git-ia64).

Ciao,
Dscho