From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 25 Apr 2013 23:21:45 GMT
Subject: Re: [BUG] Highly inconsistent diff UI
Message-ID: <20130425232145.GM29963@google.com>
In-Reply-To: <CALkWK0mMvUXnMDY87h3US0gRuM44ADEYXPh+JVP23Ja1=yz=VQ@mail.gmail.com>

Ramkumar Ramachandra wrote:

> I thought ^@ was invented for scripting, but can't imagine a usecase for ^!.

I use "git diff $commit^!" from time to time to get the diff between a
merge and its first parent.

For comparison, I haven't found ^@ or "git log $commit^!" useful.  The
commit introducing the former says

| I needed it to do the multi-tree diff on Len's infamous 12-way
| Octopus; typing "diff --cc funmerge funmerge^1 funmerge^2 funmerge^3
| ..." was too painful.

which is spelled as "git show --cc funmerge" these days.