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

Re: git-diff --cc broken in 1.4.0?

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jun 14, 2006, 20:58 UTC
Message-ID
<46a038f90606141358l5ee4f8abv207b68dc534ce02c@mail.gmail.com>
In-Reply-To
<7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net>
On 6/15/06, Junio C Hamano <junkio@cox.net> wrote:
> One thing to note is that --cc does not show a hunk in which you
> take only from one side.

Must have been that. I was looking at a big (but clean) merge, and where gitk used to show a large-ish diff there was nothing. I somehow expected an even larger diff with the changes against both sides.

thanks for the clarification and sorry about that!
m
Previous: Junio C Hamano
Message 3 of 3 in “git-diff --cc broken in 1.4.0?”
  1. Martin LanghoffJun 12, 2006
  2. Junio C HamanoJun 14, 2006
  3. Martin LanghoffJun 14, 2006

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.