From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jul 2010 00:55:54 GMT
Subject: Re: [BUG] 'diff A...B' fails with multiple merge bases
Message-ID: <7vpqys5het.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTilnl5sw4M5p8AdO_Z73zBWzlwcZ8hIcdGDXf6de@mail.gmail.com>

Sverre Rabbelier <srabbelier@gmail.com> writes:

> On Mon, Jul 12, 2010 at 19:45, Junio C Hamano <gitster@pobox.com> wrote:
>> This will trigger only when you did something random like this.
>>
>>    $ git diff ^maint master ^next ^pu sr/frotz..
>>
>> What else would you say against such an input?
>
> Something like "too many arguments, please specify at most two commits
> to diff against"?

The first part is correct, but the advice is not quite, as you are
forbidding the combined diff to emulate "git show --cc pu" to view a
merge at the tip of "pu" with

    git diff --cc pu pu~1 pu~2

which obviously has to allow three commits.