From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Feb 2007 02:15:01 GMT
Subject: Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config
Message-ID: <7vejoonrdm.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0702180259340.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Sat, 17 Feb 2007, Junio C Hamano wrote:
>
>> I do agree diff-file is too confusing with diff-files, but...
>
> ... but nobody writes out diff-files these days, right?

Actually, "diff-files -c -p" while looking at a merge conflict
is the only thing I found "git diff" does not let me do.   The
latter always gives condensed combined diff.