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, 06:41 UTC
Message-ID
<7vfxq2pgik.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<Pine.GSO.4.62.0807211316530.2841@harper.uchicago.edu>
Jonathan Nieder <jrnieder@uchicago.edu> writes:
Show 5 quoted lines
> +	This flag implies the '-c' option and makes the patch output
> +	even more compact by omitting uninteresting hunks.  A hunk is
> +	considered interesting only if either (a) it shows changes from
> +	all parents or (b) in an Octopus merge, it shows different changes
> +	from at least three different parents.

I am not sure where that "at lesta three different parents" comes from. It might be that what the logic does can be expressed that way, but that was not the guiding principle why the code does what it currently does.

These two might make it clearer what hunks are considered interesting:
    http://thread.gmane.org/gmane.comp.version-control.git/15098/focus=15109
    http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15491

Especially the latter thread, not just the focused one but the whole thing, is quite amusing.

This one gives an insight into the logical consequence of the hunk selection criteria:

    http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15600

it is worth a read after understanding why some hunks are omitted and some hunks are included by reading other articles in the thread.

Previous: Jonathan Nieder
Message 2 of 2 in “bring description of git diff --cc up to date”
  1. bring description of git diff --cc up to dateJonathan Nieder, Jul 21, 2008
  2. Junio C HamanoJul 22, 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.