From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 26 Jan 2009 18:59:07 GMT
Subject: Re: Common ancestor in merge diffs?
Message-ID: <alpine.DEB.1.00.0901261958320.25749@intel-tinevez-2-302>
In-Reply-To: <alpine.LNX.1.00.0901261318030.19665@iabervon.org>

Hi,

On Mon, 26 Jan 2009, Daniel Barkalow wrote:

> I was just doing an annoying merge (I'd reorganized code while other 
> people made changes to it), and I kept having the problem that it was hard 
> to figure out what each side had done. Is there some way to ask git for 
> the diffs between the common ancestor (which is unique in my case, so it's 
> actually useful) and each of the sides of the merge?

How about

	git diff HEAD...MERGE_HEAD

and

	git diff MERGE_HEAD...HEAD

?  I might have misunderstood, though.

Ciao,
Dscho