From: Christian MICHON <christian.michon@gmail.com>
Date: Wed, 10 Feb 2010 00:07:01 GMT
Subject: Re: What should I do to display the diff of even a simple merge commit?
Message-ID: <46d6db661002091607ka7a9c9bncc996bd5d8a26a88@mail.gmail.com>
In-Reply-To: <20100209235707.GQ9553@machine.or.cz>

On Wed, Feb 10, 2010 at 12:57 AM, Petr Baudis <pasky@suse.cz> wrote:
>  Hi!
>
> On Wed, Feb 10, 2010 at 12:45:44AM +0100, Christian MICHON wrote:
>> 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 ?
>
>  I'm not sure if there is any clever switch for this, but I usually
> just use one of
>
>        git diff mergecommit^1 mergecommit
>        git diff mergecommit^2 mergecommit
>
> depending on which parent I want the diff against. If you always do your
> merges as "on mainline, merging in a topic" without fast-forwarding,
> diff against the first parent will be probably the right one and you can
> simply use:
>
>        git diff mergecommit^ mergecommit
>

Hi Petr,

unfortunately it does not ouput anything :-( the diff is empty, again...

I'm fiddling now with "git checkout -f <that-commit>", and I'm faking
an "amend last commit" using "git gui". With this dirty trick, I get
the same diff I would have gotten from git gui with a merge
--no-commit.

Thanks for suggesting !

-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !