From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Sep 2008 06:14:06 GMT
Subject: Re: combined diff, but not condensed, howto?
Message-ID: <7vy71qyo9d.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <48D1EDB7.5070107@viscovery.net>

Johannes Sixt <j.sixt@viscovery.net> writes:

> Junio C Hamano schrieb:
>> Johannes Sixt <j.sixt@viscovery.net> writes:
>> 
>>> After a merge conflict, 'git diff' shows a combined diff, which presents
>>> only the parts that conflicted or where there are near-by changes from
>>> different parents (potential conflicts). Is there a command line switch so
>>> that *all* changes are shown, even non-conflicting ones?
>> 
>> Like "git diff HEAD"?
>
> No. Something that produces
...

Ah, I see what you mean.

It all happens inside combine-diff.c::make_hunks().  If you pass dense==0,
you should be able to get all the uninteresting hunks, I think.

Perhaps

	$ git diff --base -c

???