From: Junio C Hamano Date: Tue, 07 Jun 2011 04:03:47 GMT Subject: Re: Command-line interface thoughts Message-ID: <7voc2a70f0.fsf@alter.siamese.dyndns.org> In-Reply-To: Michael Nahas writes: > I think NEXT and WTREE should be like tree objects, not commits, so I > would argue that "git show NEXT" should show what it shows for a tree. So what is the definition of such a "tree" during a conflicted merge? The traditional definition is "such a state cannot be expressed as a tree". You are free to define it the same way, or for NEXT to be more useful than status quo, come up with a better definition. > My thought is that NEXT should only represent those changing files > that have been resolved.  So, NEXT would be HEAD plus the files in > Stage0.  So, "git diff HEAD NEXT" would print out the changes in > Stage0. That would mean conflicted files will all be shown as removed, or unchanged? Either would be more confusing.