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

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

From
Junio C Hamano <junkio@cox.net>
Date
Jun 14, 2006, 20:32 UTC
Message-ID
<7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com>
"Martin Langhoff" <martin.langhoff@gmail.com> writes:
> I was looking at some merges in gitk and lamenting the apparent loss
> of the nice two-sided diff we get with -cc, and now duting a slightly
> messy merge I did git-diff -cc only to get...

This not a regression that I know of in 1.4.0; mind showing the stage 2 and 3 blobs and the file in the resolution result (I do not need stage 1)?

One thing to note is that --cc does not show a hunk in which you take only from one side.

Show 5 quoted lines
>
> $ git-ls-files --unmerged
> 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1       local/version.php
> 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2       local/version.php
> 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3       local/version.php
Previous: Martin LanghoffNext: Martin Langhoff
Message 2 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.