From: Christian MICHON Date: Tue, 09 Feb 2010 23:46:57 GMT Subject: Re: What should I do to display the diff of even a simple merge commit? Message-ID: <46d6db661002091546r1372836cs5dc47d54ae8eb19e@mail.gmail.com> In-Reply-To: <46d6db661002091545j74f625ffr74ca70a0474948fc@mail.gmail.com> On Wed, Feb 10, 2010 at 12:45 AM, Christian MICHON 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 > " 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 !