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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 18, 2007, 11:40 UTC
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:

Show 11 quoted lines

> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.