What should I do to display the diff of even a simple merge commit?
- From
Christian MICHON <christian.michon@gmail.com>
- Date
- Feb 9, 2010, 23:45 UTC
- Message-ID
- <46d6db661002091545j74f625ffr74ca70a0474948fc@mail.gmail.com>
Hi list,
I'm performing many merges between developpers branches these days, most of them not yielding into conflicts. (understand: simple merges)
All is good, but sometimes, I would like to really like what has been changed.
As I do not systematically do this "git merge --no-commit --stat <list_to_merge>" and then fire "git gui" to inspect the diffs before the real commit, I'm wondering: how could I do this using some plumbing ?
Right now, I've tried the obvious git log -c -p, git show -u --cc, but since the merge are simple merges, I cannot get any diff output. I believe this is by construction.
Any hints ?
Thanks in advance.
-- Christian -- http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !