From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 21 Oct 2006 01:19:45 GMT
Subject: Re: VCS comparison table
Message-ID: <Pine.LNX.4.64.0610201818210.3962@g5.osdl.org>
In-Reply-To: <7vy7rajwyn.fsf@assigned-by-dhcp.cox.net>



On Fri, 20 Oct 2006, Junio C Hamano wrote:
> 
> There is another one similar to the gitweb one you mentioned:
> git-show --stat on a merge.  We deliberately chose to show the
> difference from the first parent; it is called "showing the
> changes the person who made this merge saw".

Well, that one actually makes sense. It's just the stat from the previous 
state, after all, and it actually is done _together_ with the operation 
that causes the diffs.

So that one I don't think you can really even claim.

Also, it's not even the "first parent". Look closer. It's literally 
"previous state", because it does so for a fast-forward too. It's from 
ORIG_HEAD.

		Linus