From: Jeff King <peff@peff.net>
Date: Wed, 08 Jun 2011 15:05:37 GMT
Subject: Re: Command-line interface thoughts (ad-hominem attacks)
Message-ID: <20110608150537.GC7805@sigill.intra.peff.net>
In-Reply-To: <BANLkTinoQCZhyhgw61u7c3eF4e5MEf+eFA@mail.gmail.com>

On Wed, Jun 08, 2011 at 07:39:16AM -0400, Michael Nahas wrote:

> On Wed, Jun 8, 2011 at 7:12 AM, Jakub Narebski <jnareb@gmail.com> wrote:
> > I don't quite think that we need "git diff NEXT WTREE"; the short
> > and sweet "git diff" is short for a reason,
> 
> To be clear, I'm not advocating and have never advocated getting rid
> of zero-argument "git diff".  I've advocated that every (whole
> project) diff command should be expressible by a "git diff TREE1
> TREE2".  I'm fine with defaults if one or zero trees are specified.

I agree with this, but...

> So "git diff" would default to "git diff NEXT WTREE".

Isn't this going to be behavior change, since your NEXT is not quite the
same as the index? How do I now get an n-way combined diff of the
unmerged files in the index?

-Peff