From: Christof Krüger <git@christof-krueger.de>
Date: Mon, 18 Jul 2011 17:10:24 GMT
Subject: Re: What changed in merge commit?
Message-ID: <1311009024.18226.121.camel@oxylap>
In-Reply-To: <CABPQNSaOQxBqf34_799zc46EnHsc7L3BiSATyYq+Q6oGs0H6sw@mail.gmail.com>

On Mo, 2011-07-18 at 18:52 +0200, Erik Faye-Lund wrote:
> You probably want to do something like "git diff SHA1-OF-MERGE^
> SHA1-OF-MERGE" to see what the merge changed compared to it's previous
> commit.
You could also use "git log --name-status -m" which will show multiple
entries for each parent of the merge commit.
See "man git-diff-tree" and look for the description of the options -m,
-c and --cc

Bye,
  Chris