On Tue, 24 Jan 2006, Junio C Hamano wrote:
quoted text
>
> 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
-
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