On Mon, Jul 18, 2011 at 6:44 PM, Patrick Doyle <wpdster@xxxxxxxxx> wrote: > Since today seems to be my day to hang out on this list, I thought I'd > ask another burning question... > > How can I see what changed in a merge commit? > > $ git log > > just says "merge remote branch 'origin/master' into wpd" and > > $ git log --name-status > > says the same thing -- it doesn't list any files as having changed. That's because nothing did change; it's the merge's parents that are the commits that changed something. If there was a fix-up (either due to a merge-conflict or an explicitly squashed-in change), then that would show up for the merge-commit. You probably want to do something like "git diff SHA1-OF-MERGE^ SHA1-OF-MERGE" to see what the merge changed compared to it's previous commit. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html