git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Do 3-way diff between HEAD, index and working directory

From
Junio C Hamano <junkio@cox.net>
Date
Sep 4, 2006, 22:23 UTC
Message-ID
<7vpsebl19n.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<17660.4160.642852.177249@cargo.ozlabs.ibm.com>
Paul Mackerras <paulus@samba.org> writes:
Show 8 quoted lines
> This implements a 3-way diff between the HEAD commit, the state in the
> index, and the working directory.  This is like the n-way diff for a
> merge, and uses much of the same code.  It is invoked with the -c flag
> to git-diff-index, which it already accepted and did nothing with.
>
> Signed-off-by: Paul Mackerras <paulus@samba.org>
> ---
> Junio, does this look right?

Seems correct from a cursory look. This also seems to change the behaviour for an unmerged entry case slightly but I think it is for the better (depending on the definition of "better" -- some people may feel combined diff to be weird and confusing).

Previous: Paul Mackerras
Message 2 of 2 in “Do 3-way diff between HEAD, index and working directory”
  1. Do 3-way diff between HEAD, index and working directoryPaul Mackerras, Sep 4, 2006
  2. Junio C HamanoSep 4, 2006

Read the whole thread, see it on lore, or plain text.

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