From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: VCS comparison table Date: Fri, 20 Oct 2006 18:19:45 -0700 (PDT) Message-ID: References: <20061019123349.GE20017@pasky.or.cz> <200610201350.12273.jnareb@gmail.com> <7vlknalgne.fsf@assigned-by-dhcp.cox.net> <7vy7rajwyn.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git@vger.kernel.org, Jakub Narebski X-From: git-owner@vger.kernel.org Sat Oct 21 03:19:58 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Gb5Wn-000658-Ow for gcvg-git@gmane.org; Sat, 21 Oct 2006 03:19:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030377AbWJUBTw (ORCPT ); Fri, 20 Oct 2006 21:19:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030378AbWJUBTw (ORCPT ); Fri, 20 Oct 2006 21:19:52 -0400 Received: from smtp.osdl.org ([65.172.181.4]:61108 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1030377AbWJUBTw (ORCPT ); Fri, 20 Oct 2006 21:19:52 -0400 Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id k9L1JkaX020105 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 20 Oct 2006 18:19:46 -0700 Received: from localhost (shell0.pdx.osdl.net [10.9.0.31]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id k9L1Jjgp009966; Fri, 20 Oct 2006 18:19:45 -0700 To: Junio C Hamano In-Reply-To: <7vy7rajwyn.fsf@assigned-by-dhcp.cox.net> X-Spam-Status: No, hits=-0.482 required=5 tests=AWL X-Spam-Checker-Version: SpamAssassin 2.63-osdl_revision__1.95__ X-MIMEDefang-Filter: osdl$Revision: 1.155 $ X-Scanned-By: MIMEDefang 2.36 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: 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