{"thread":{"id":"4477","subject":"git-diff --cc broken in 1.4.0?","startedAt":"2006-06-12T04:32:45Z","lastAt":"2006-06-14T20:58:28Z","messageCount":3,"participants":["Martin Langhoff","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"21630","messageId":"46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com","threadId":"4477","inReplyTo":null,"subject":"git-diff --cc broken in 1.4.0?","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2006-06-12T04:32:45Z","receivedAt":"2006-06-12T04:32:45Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"I was looking at some merges in gitk and lamenting the apparent loss\nof the nice two-sided diff we get with -cc, and now duting a slightly\nmessy merge I did git-diff -cc only to get...\n\n$ git-ls-files --unmerged\n100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1       local/version.php\n100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2       local/version.php\n100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3       local/version.php\n\n$ git-diff --cc\ndiff --cc local/version.php\nindex 9352efa,50da9b4..0000000\n--- a/local/version.php\n+++ b/local/version.php\n\ncheers,\n\n\nmartin\n"},{"id":"21800","messageId":"7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net","threadId":"4477","inReplyTo":"46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com","subject":"Re: git-diff --cc broken in 1.4.0?","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-14T20:32:46Z","receivedAt":"2006-06-14T20:32:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Martin Langhoff\" <martin.langhoff@gmail.com> writes:\n\n> I was looking at some merges in gitk and lamenting the apparent loss\n> of the nice two-sided diff we get with -cc, and now duting a slightly\n> messy merge I did git-diff -cc only to get...\n\nThis not a regression that I know of in 1.4.0; mind showing the\nstage 2 and 3 blobs and the file in the resolution result (I do\nnot need stage 1)?\n\nOne thing to note is that --cc does not show a hunk in which you\ntake only from one side.\n\n>\n> $ git-ls-files --unmerged\n> 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1       local/version.php\n> 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2       local/version.php\n> 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3       local/version.php\n"},{"id":"21801","messageId":"46a038f90606141358l5ee4f8abv207b68dc534ce02c@mail.gmail.com","threadId":"4477","inReplyTo":"7vmzcfcwb5.fsf@assigned-by-dhcp.cox.net","subject":"Re: git-diff --cc broken in 1.4.0?","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2006-06-14T20:58:28Z","receivedAt":"2006-06-14T20:58:28Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 6/15/06, Junio C Hamano <junkio@cox.net> wrote:\n> One thing to note is that --cc does not show a hunk in which you\n> take only from one side.\n\nMust have been that. I was looking at a big (but clean) merge, and\nwhere gitk used to show a large-ish diff there was nothing. I somehow\nexpected an even larger diff with the changes against both sides.\n\nthanks for the clarification and sorry about that!\n\n\n\nm\n"}]}