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

git-diff --cc broken in 1.4.0?

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jun 12, 2006, 04:32 UTC
Message-ID
<46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com>

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...

$ git-ls-files --unmerged 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1 local/version.php 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2 local/version.php 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3 local/version.php

$ git-diff --cc diff --cc local/version.php index 9352efa,50da9b4..0000000

--- a/local/version.php
+++ b/local/version.php

cheers,


martin
Next: Junio C Hamano
Message 1 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.