From: "Christof Krüger" <git@christof-krueger.de>
To: kusmabite@gmail.com
Cc: Patrick Doyle <wpdster@gmail.com>, git <git@vger.kernel.org>
Subject: Re: What changed in merge commit?
Date: Mon, 18 Jul 2011 19:10:24 +0200 [thread overview]
Message-ID: <1311009024.18226.121.camel@oxylap> (raw)
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
next prev parent reply other threads:[~2011-07-18 17:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 16:44 What changed in merge commit? Patrick Doyle
2011-07-18 16:52 ` Erik Faye-Lund
2011-07-18 17:10 ` Christof Krüger [this message]
2011-07-18 17:25 ` Patrick Doyle
2011-07-18 20:39 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311009024.18226.121.camel@oxylap \
--to=git@christof-krueger.de \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=wpdster@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.