{"thread":{"id":"14286","subject":"Puzzled by gitk patch representation for merge commits","startedAt":"2008-07-04T09:14:20Z","lastAt":"2008-07-04T17:51:22Z","messageCount":2,"participants":["Jerome Lovy","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"82216","messageId":"g4kpmu$9ga$1@ger.gmane.org","threadId":"14286","inReplyTo":null,"subject":"Puzzled by gitk patch representation for merge commits","fromName":"Jerome Lovy","fromEmail":"t2a2e9z8ncbs9qg@brefemail.com","sentAt":"2008-07-04T09:14:20Z","receivedAt":"2008-07-04T09:14:20Z","isPatch":false,"sender":{"key":"t2a2e9z8ncbs9qg@brefemail.com","avatar":null},"body":"Hello,\n\nI don't understand the graphical scheme that gitk uses when displaying \npatches for merge commits. I would like to be able to explain this to \nthe people I'm trying to evangelize to git, because they are also \npuzzled when they try to check with gitk what a merge has done to a \ngiven file.\n\nI can see that at least three graphical hints seem to be involved:\n- font: regular/bold\n- color: red/blue\n(maybe there are more colors when the commit has more than two parents?)\n- column for displaying the '+' or '-'\n\nBut I just don't see what is the respective semantics of these hints...\n\n(I'm using git 1.5.5.1 if that matters.)\n\nThanks in advance,\nJérôme\n"},{"id":"82243","messageId":"Pine.GSO.4.62.0807041240110.19792@harper.uchicago.edu","threadId":"14286","inReplyTo":"g4kpmu$9ga$1@ger.gmane.org","subject":"Re: Puzzled by gitk patch representation for merge commits","fromName":"Jonathan Nieder","fromEmail":"jrnieder@uchicago.edu","sentAt":"2008-07-04T17:51:22Z","receivedAt":"2008-07-04T17:51:22Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi Jérôme,\n\nJerome Lovy wrote:\n\n> I don't understand the graphical scheme that gitk uses when displaying\n> patches for merge commits. I would like to be able to explain this to the\n> people I'm trying to evangelize to git, because they are also puzzled when\n> they try to check with gitk what a merge has done to a given file.\n> \n> I can see that at least three graphical hints seem to be involved:\n> - font: regular/bold\n> - color: red/blue\n> (maybe there are more colors when the commit has more than two parents?)\n> - column for displaying the '+' or '-'\n\nAll of the information is there in the text; the color and font are just\nsupposed to make it easier to see.  As for the diff text itself, I\ndidn't remember what it meant myself, so I looked it up.\n\nIt seems the diff format shown is that produced by 'git-diff --cc',\nwhich makes a \"compact combined diff\".  It only shows conflicting\nchanges.  Each column on the left represents the changes from a\ndifferent parent.\n\nHope that helps,\nJonathan"}]}