From: Junio C Hamano Date: Sat, 21 Oct 2006 01:27:06 GMT Subject: Re: VCS comparison table Message-ID: <7vfydijw5x.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Linus Torvalds writes: > 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. I was not talking about "git pull". I was talking about "git show".