{"thread":{"id":"27846","subject":"What changed in merge commit?","startedAt":"2011-07-18T16:44:36Z","lastAt":"2011-07-18T20:39:15Z","messageCount":5,"participants":["Patrick Doyle","Erik Faye-Lund","Christof Krüger","Andreas Schwab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"171586","messageId":"CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com","threadId":"27846","inReplyTo":null,"subject":"What changed in merge commit?","fromName":"Patrick Doyle","fromEmail":"wpdster@gmail.com","sentAt":"2011-07-18T16:44:36Z","receivedAt":"2011-07-18T16:44:36Z","isPatch":false,"sender":{"key":"wpdster@gmail.com","avatar":null},"body":"Since today seems to be my day to hang out on this list, I thought I'd\nask another burning question...\n\nHow can I see what changed in a merge commit?\n\n$ git log\n\njust says \"merge remote branch 'origin/master' into wpd\" and\n\n$ git log --name-status\n\nsays the same thing -- it doesn't list any files as having changed.\n\nPerhaps nothing changed between the last time I merged with\norigin/master and the current time. I know that at least one change\nwas committed. I suppose it's possible that two (or more) changes\nwere committed, undoing that one change. (But I don't think that's\nlikely).\n\nI could go back and look at the log for origin/master... and I'm sure\nthere's some way to say \"just give me the log of changes since the\nlast time I merged\", or more to the point now, \"just give me the log\nof changes since the time before the last time I merged\". It probably\nhas something to do with a couple of ref names, a caret, and some\ndots, but I get lost in all of that syntax.\n\nThanks for the tips.\n\n--wpd\n"},{"id":"171588","messageId":"CABPQNSaOQxBqf34_799zc46EnHsc7L3BiSATyYq+Q6oGs0H6sw@mail.gmail.com","threadId":"27846","inReplyTo":"CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com","subject":"Re: What changed in merge commit?","fromName":"Erik Faye-Lund","fromEmail":"kusmabite@gmail.com","sentAt":"2011-07-18T16:52:33Z","receivedAt":"2011-07-18T16:52:33Z","isPatch":false,"sender":{"key":"kusmabite@gmail.com","avatar":"https://avatars.githubusercontent.com/u/47073?v=4"},"body":"On Mon, Jul 18, 2011 at 6:44 PM, Patrick Doyle wrote:\n> Since today seems to be my day to hang out on this list, I thought I'd\n> ask another burning question...\n>\n> How can I see what changed in a merge commit?\n>\n> $ git log\n>\n> just says \"merge remote branch 'origin/master' into wpd\" and\n>\n> $ git log --name-status\n>\n> says the same thing -- it doesn't list any files as having changed.\n\nThat's because nothing did change; it's the merge's parents that are\nthe commits that changed something. If there was a fix-up (either due\nto a merge-conflict or an explicitly squashed-in change), then that\nwould show up for the merge-commit.\n\nYou probably want to do something like \"git diff SHA1-OF-MERGE^\nSHA1-OF-MERGE\" to see what the merge changed compared to it's previous\ncommit.\n"},{"id":"171590","messageId":"1311009024.18226.121.camel@oxylap","threadId":"27846","inReplyTo":"CABPQNSaOQxBqf34_799zc46EnHsc7L3BiSATyYq+Q6oGs0H6sw@mail.gmail.com","subject":"Re: What changed in merge commit?","fromName":"Christof Krüger","fromEmail":"git@christof-krueger.de","sentAt":"2011-07-18T17:10:24Z","receivedAt":"2011-07-18T17:10:24Z","isPatch":false,"sender":{"key":"git@christof-krueger.de","avatar":null},"body":"On Mo, 2011-07-18 at 18:52 +0200, Erik Faye-Lund wrote:\n> You probably want to do something like \"git diff SHA1-OF-MERGE^\n> SHA1-OF-MERGE\" to see what the merge changed compared to it's previous\n> commit.\nYou could also use \"git log --name-status -m\" which will show multiple\nentries for each parent of the merge commit.\nSee \"man git-diff-tree\" and look for the description of the options -m,\n-c and --cc\n\nBye,\n Chris\n"},{"id":"171591","messageId":"CAF_dkJCvNHWYfjmF8bX5CT+wyQ9ftvN7aAr0FBeg5ZQ7BSuyUA@mail.gmail.com","threadId":"27846","inReplyTo":"1311009024.18226.121.camel@oxylap","subject":"Re: What changed in merge commit?","fromName":"Patrick Doyle","fromEmail":"wpdster@gmail.com","sentAt":"2011-07-18T17:25:30Z","receivedAt":"2011-07-18T17:25:30Z","isPatch":false,"sender":{"key":"wpdster@gmail.com","avatar":null},"body":"2011/7/18 Christof Krüger :\n> You could also use \"git log --name-status -m\" which will show multiple\n> entries for each parent of the merge commit.\n> See \"man git-diff-tree\" and look for the description of the options -m,\n> -c and --cc\n\nThanks...\n\n$ git log --name-status -m --first-parent\n\nis what I was looking for. I thought I recalled there being something\nlike that, but could not recall nor find on the git-log man page the\n\"-m\" option. Of course I can see it now :-)\n\nThanks for pointing me in the right direction.\n\n--wpd\n"},{"id":"171608","messageId":"m24o2jfhn0.fsf@igel.home","threadId":"27846","inReplyTo":"CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com","subject":"Re: What changed in merge commit?","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2011-07-18T20:39:15Z","receivedAt":"2011-07-18T20:39:15Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Patrick Doyle writes:\n\n> How can I see what changed in a merge commit?\n\n`git show -m' will show a diff for each parent. See \"Diff Formatting\" in\ngit-log(1).\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}