# git-diff --cc broken in 1.4.0? 3 messages from 2006-06-12 to 2006-06-14. Participants: Martin Langhoff, Junio C Hamano. Thread: https://gitlist.dev/t/4477 ## Martin Langhoff, 2006-06-12 04:32 Subject: git-diff --cc broken in 1.4.0? Message-ID: <46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90606112132jaf33a25x5794a19db2a06d8d%40mail.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 ``` ## Junio C Hamano, 2006-06-14 20:32 Subject: Re: git-diff --cc broken in 1.4.0? Message-ID: <7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vmzcfcwb5.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com> ``` "Martin Langhoff" 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. > > $ git-ls-files --unmerged > 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1 local/version.php > 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2 local/version.php > 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3 local/version.php ``` ## Martin Langhoff, 2006-06-14 20:58 Subject: Re: git-diff --cc broken in 1.4.0? Message-ID: <46a038f90606141358l5ee4f8abv207b68dc534ce02c@mail.gmail.com> URL: https://gitlist.dev/e/46a038f90606141358l5ee4f8abv207b68dc534ce02c%40mail.gmail.com In-Reply-To: <7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net> ``` On 6/15/06, Junio C Hamano 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 ```