From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: Better handling of local changes in 'gitk'? Date: Fri, 13 Jul 2007 12:32:05 -0700 (PDT) Message-ID: References: <18071.19489.6733.665052@cargo.ozlabs.ibm.com> <18071.20289.270560.640460@cargo.ozlabs.ibm.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=us-ascii Cc: Git Mailing List To: Paul Mackerras X-From: git-owner@vger.kernel.org Fri Jul 13 21:32:31 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1I9QsQ-0005vy-Uv for gcvg-git@gmane.org; Fri, 13 Jul 2007 21:32:31 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759624AbXGMTcX (ORCPT ); Fri, 13 Jul 2007 15:32:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759357AbXGMTcX (ORCPT ); Fri, 13 Jul 2007 15:32:23 -0400 Received: from smtp2.linux-foundation.org ([207.189.120.14]:48910 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757364AbXGMTcW (ORCPT ); Fri, 13 Jul 2007 15:32:22 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [207.189.120.55]) by smtp2.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id l6DJWADq016650 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Jul 2007 12:32:11 -0700 Received: from localhost (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id l6DJW5jw014678; Fri, 13 Jul 2007 12:32:05 -0700 In-Reply-To: <18071.20289.270560.640460@cargo.ozlabs.ibm.com> X-Spam-Status: No, hits=-2.611 required=5 tests=AWL,BAYES_00 X-Spam-Checker-Version: SpamAssassin 3.1.0-osdl_revision__1.12__ X-MIMEDefang-Filter: osdl$Revision: 1.181 $ X-Scanned-By: MIMEDefang 2.53 on 207.189.120.14 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Fri, 13 Jul 2007, Paul Mackerras wrote: > > I should add that I'm sure that gitk won't yet do the right thing if > there are files in the index at other than stage 0, or if the local > changes are the result of an incomplete merge. (In the latter case I > suppose one or other of the fake commits should have multiple parents, > but I don't have the infrastructure to add fake commits with multiple > parents yet.) That would be beautiful to see, indeed, when you're in the middle of a merge. "gitk --merge" already does most of it, but actually seeing the diff of the currently merged stuff would be pretty darn cool. Linus