From: Junio C Hamano <gitster@pobox.com>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, "Pickens\,
James E" <james.e.pickens@intel.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [BUG] 'diff A...B' fails with multiple merge bases
Date: Mon, 12 Jul 2010 17:55:54 -0700 [thread overview]
Message-ID: <7vpqys5het.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTilnl5sw4M5p8AdO_Z73zBWzlwcZ8hIcdGDXf6de@mail.gmail.com> (Sverre Rabbelier's message of "Mon\, 12 Jul 2010 19\:49\:46 -0500")
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.
next prev parent reply other threads:[~2010-07-13 0:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-10 1:15 [BUG] 'diff A...B' fails with multiple merge bases Pickens, James E
2010-07-12 23:30 ` Junio C Hamano
2010-07-13 0:20 ` Junio C Hamano
2010-07-13 0:25 ` Junio C Hamano
2010-07-13 0:41 ` Sverre Rabbelier
2010-07-13 0:45 ` Junio C Hamano
2010-07-13 0:49 ` Sverre Rabbelier
2010-07-13 0:55 ` Junio C Hamano [this message]
2010-07-13 1:12 ` Sverre Rabbelier
2010-07-13 1:16 ` Pickens, James E
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vpqys5het.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=james.e.pickens@intel.com \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox