From: Elijah Newren <newren@gmail.com>
Date: Fri, 22 Aug 2008 19:10:36 GMT
Subject: Re: Call Me Gitless
Message-ID: <51419b2c0808221210k6e7defdcw3ba9e4ef89e054e7@mail.gmail.com>
In-Reply-To: <48AD7895.5010707@gnu.org>

On Thu, Aug 21, 2008 at 8:15 AM, Paolo Bonzini <bonzini@gnu.org> wrote:
> I used to think that the proposal I saw in another git frontend, which is:
>
>        git diff --cached -->   git diff --staged
>        git diff -->            git diff --unstaged
>        git diff HEAD -->       git diff
>
> was a good one, but it is actually not when you start thinking about what to
> do during a large merge with few conflicts.  In fact, even though I use the
> index almost exclusively when merging (*), I don't mind the few extra
> keystrokes.

If you look a little closer, you'll note that the three lines of this
proposal has an exception specifically for the conflict during merge
case.   :-)

Elijah