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

Re: [PATCH] bring description of git diff --cc up to date

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 22, 2008, 17:09 UTC
Message-ID
<7v63qxn8w2.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080722111947.BIW29914@m4500-01.uchicago.edu>
Jonathan Nieder <jrnieder@uchicago.edu> writes:
Show 8 quoted lines
> Just to make sure I understand, here is what I think --cc does:
>
>   - In a two-parent merge, it is exactly as Linus has been
>     ...
>   - In a many-parent merge, the criterion is more stringent.
>     ...
>
> Is that correct?

The logic in the code does not have separate criteria for two-parent and Octopus cases. Actually Linus talks about "when you have two versions to choose from, and if the result matches one of them, then it is not interesting". In a two-parent merge, you cannot have three or more possible versions to choose from by definition, can you?

Previous: Jonathan NiederNext: Junio C Hamano
Message 2 of 8 in “Re: [PATCH] bring description of git diff --cc up to date”
  1. Jonathan NiederJul 22, 2008
  2. Junio C HamanoJul 22, 2008
  3. Junio C HamanoJul 22, 2008
  4. Jonathan NiederJul 22, 2008
  5. Junio C HamanoJul 23, 2008
  6. Jonathan NiederJul 23, 2008
  7. Junio C HamanoJul 23, 2008
  8. Jonathan NiederJul 24, 2008

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.