From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Feb 2006 02:26:39 GMT
Subject: Re: gitweb using "--cc"?
Message-ID: <Pine.LNX.4.64.0602081817040.2458@g5.osdl.org>
In-Reply-To: <43EAA560.8030504@didntduck.org>



On Wed, 8 Feb 2006, Brian Gerst wrote:
> 
> git-whatchanged doesn't show that merge commit either.

Actually, it does. You just have to ask it.

	git-whatchanged --cc

The thing is, "git-whatchanged" is different from "git diff" and other 
helpers, in that it by default shows the "raw" git representation. Which 
indeed doesn't show that merge as being anything interesting.

But with "--cc", the merge suddenly blossoms.

Now, arguably, the raw format should default to the same kind of "were 
there data conflicts" that "-c" does for merges, but it doesn't, so it's 
silent ;(

		Linus