Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config

From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: 2007-02-18 22:40:58
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

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Sun Feb 18 22:41:44 2007

This archive was generated by hypermail 2.1.8 : 2007-02-18 22:43:43 EST