From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Thu, 25 Apr 2013 09:30:51 GMT
Subject: Re: [BUG] Highly inconsistent diff UI
Message-ID: <CALkWK0m=g3evr83ci5ZnTFHSEnCb_fRSer0j+sw1rRaaKDnY1A@mail.gmail.com>
In-Reply-To: <CALkWK0n9xqQr30QWEuhuM9c1xrAJ=SpYVBjkiRk+tP5E7DtBGw@mail.gmail.com>

Ramkumar Ramachandra wrote:
> $ git diff rebase.autostash ^$(git merge-base rebase.autostash master)

So, Thomas pointed out on IRC that there is one edge-case: a
criss-cross merge.  So, we can define A~B as B ^$(git-merge-base
--closest-to=B A B).  If both A and B are equidistant from the
criss-cross merge [will that ever happen in practice?], we have no
choice but to error out.