From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 18 Feb 2007 11:40:58 GMT
Subject: Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config
Message-ID: <Pine.LNX.4.63.0702181240320.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vejoonrdm.fsf@assigned-by-dhcp.cox.net>

Hi,

On Sat, 17 Feb 2007, Junio C Hamano wrote:

> 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.

So, diff2 is my preference. If anybody has better suggestions: go ahead.

Ciao,
Dscho