git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [BUG] 'diff A...B' fails with multiple merge bases

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Jul 13, 2010, 01:12 UTC
Message-ID
<AANLkTikCiJtnRlKTbhiSRe48aDY27QPvjrEyjiOGGRsl@mail.gmail.com>
In-Reply-To
<7vpqys5het.fsf@alter.siamese.dyndns.org>
Heya,
On Mon, Jul 12, 2010 at 19:55, Junio C Hamano <gitster@pobox.com> wrote:
> which obviously has to allow three commits.

Well, then say that. "too many arguments for a regular diff, please specify at most two commits to diff against". Anyone trying to use diff to show a merge diff likely knows to look for the --cc switch; either way, it'd be better than "what do you mean?".

-- 
Cheers,

Sverre Rabbelier
Previous: Junio C HamanoNext: Pickens, James E
Message 9 of 10 in “[BUG] 'diff A...B' fails with multiple merge bases”
  1. Pickens, James EJul 10, 2010
  2. Junio C HamanoJul 12, 2010
  3. Junio C HamanoJul 13, 2010
  4. Junio C HamanoJul 13, 2010
  5. Sverre RabbelierJul 13, 2010
  6. Junio C HamanoJul 13, 2010
  7. Sverre RabbelierJul 13, 2010
  8. Junio C HamanoJul 13, 2010
  9. Sverre RabbelierJul 13, 2010
  10. Pickens, James EJul 13, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.