On Wed, Feb 10, 2010 at 12:45 AM, Christian MICHON
[off-list ref] wrote:
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.
I meant << I would really like to see 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 !