From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Sep 2008 16:58:30 GMT
Subject: Re: combined diff, but not condensed, howto?
Message-ID: <7vwsha6761.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <48D0B907.7040903@viscovery.net>

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"?