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

Re: [PATCH] diff-tree -c: show a merge commit a bit more sensibly.

From
Linus Torvalds <torvalds@osdl.org>
Date
Jan 24, 2006, 22:15 UTC
Message-ID
<Pine.LNX.4.64.0601241655090.10804@evo.osdl.org>
In-Reply-To
<7vwtgqas0y.fsf@assigned-by-dhcp.cox.net>
On Tue, 24 Jan 2006, Junio C Hamano wrote:
>
> A new option '-c' to diff-tree changes the way a merge commit is
> displayed when generating a patch output.  It shows a "combined
> diff" (hence the option letter 'c'), which looks like this:
Thank you!

Can you make this the default for "git-whatchanged" too? That way, merges that have manual fixups will actually show up in the whatchanged output.

Also, it would be perhaps even nicer if it had a "dense" version, which only showed the chunks that had differences from more than one parent. Chunks that have diffs from just one parent obviously had no conflicts in that chunk, so they are much less interesting than a chunk that was different from more than one parent..

			Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 4 in “diff-tree -c: show a merge commit a bit more sensibly.”
  1. diff-tree -c: show a merge commit a bit more sensibly.Junio C Hamano, Jan 24, 2006
  2. Linus TorvaldsJan 24, 2006
  3. Junio C HamanoJan 25, 2006
  4. Florian WeimerJan 25, 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.