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

Re: Confused about diff-tree --cc output

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 4, 2009, 21:56 UTC
Message-ID
<7vk585n9x8.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<76718490902041313y44eeb99bya33513bc9818aeb0@mail.gmail.com>
Jay Soffian <jaysoffian@gmail.com> writes:
> My understanding of "git show <merge commit>" is that it should only
> show changes if the merge resulted in a conflict that needed to be
> touched up (ignoring the possibility of an evil merge). Yet git show
> on this commit shows this diff:
I think this is "more than two versions", in
    http://thread.gmane.org/gmane.comp.version-control.git/15486/focus=15491
Nothing new to see here, I think.
Previous: Jay SoffianNext: Jay Soffian
Message 2 of 5 in “Confused about diff-tree --cc output”
  1. Jay SoffianFeb 4, 2009
  2. Junio C HamanoFeb 4, 2009
  3. Jay SoffianFeb 5, 2009
  4. Junio C HamanoFeb 5, 2009
  5. Jay SoffianFeb 5, 2009

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.