Hello, sorry for possibly a silly question, but can I get a diff of a merge commit with _union_ of changes against all the parents? $ git-diff-tree --abbrev -r -m --pretty=raw badfc383b diff-tree badfc38... (from 1ee6c84...) tree 29d81f18912328df4f4104e9b9cc355424ced04d parent 1ee6c84efda742eda8b4b200491341125d8d9639 parent 453b160f03c8c6d450879482f617412c257e5889 author Petr Baudis <pasky@xxxxxxx> 1143328578 +0100 committer Petr Baudis <xpasky@xxxxxxxxxxxxx> 1143328578 +0100 Merge with v0.17 :100755 100755 743c19f... b05900d... M Documentation/make-cogito-asciidoc :100644 100644 5896df7... 6f06c35... M cg-Xlib diff-tree badfc38... (from 453b160...) tree 29d81f18912328df4f4104e9b9cc355424ced04d parent 1ee6c84efda742eda8b4b200491341125d8d9639 parent 453b160f03c8c6d450879482f617412c257e5889 author Petr Baudis <pasky@xxxxxxx> 1143328578 +0100 committer Petr Baudis <xpasky@xxxxxxxxxxxxx> 1143328578 +0100 Merge with v0.17 :100644 100644 24ce0a4... d540853... M TODO :100755 100755 6005083... f7efa9d... M cg-log I would like something like: diff-tree badfc38... (from parents) tree 29d81f18912328df4f4104e9b9cc355424ced04d parent 1ee6c84efda742eda8b4b200491341125d8d9639 parent 453b160f03c8c6d450879482f617412c257e5889 author Petr Baudis <pasky@xxxxxxx> 1143328578 +0100 committer Petr Baudis <xpasky@xxxxxxxxxxxxx> 1143328578 +0100 Merge with v0.17 :100755 100755 743c19f... b05900d... M Documentation/make-cogito-asciidoc :100644 100644 24ce0a4... d540853... M TODO :100644 100644 5896df7... 6f06c35... M cg-Xlib :100755 100755 6005083... f7efa9d... M cg-log Now, the -c option documentation says: It shows the differences from each of the parents to the merge result simultaneously, instead of showing pairwise diff between a parent and the result one at a time, which '-m' option output does. This sounds as exactly what I want. Well, the only problem is that the same diff command as above with -c option added produces no diff at all, just the header and commit messages. Did I misunderstand the -c description and does it do something different? Thanks, -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Right now I am having amnesia and deja-vu at the same time. I think I have forgotten this before. - : 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