From: Andreas Schwab <schwab@linux-m68k.org>
To: Patrick Doyle <wpdster@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: What changed in merge commit?
Date: Mon, 18 Jul 2011 22:39:15 +0200 [thread overview]
Message-ID: <m24o2jfhn0.fsf@igel.home> (raw)
In-Reply-To: <CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com> (Patrick Doyle's message of "Mon, 18 Jul 2011 12:44:36 -0400")
Patrick Doyle <wpdster@gmail.com> writes:
> How can I see what changed in a merge commit?
`git show -m' will show a diff for each parent. See "Diff Formatting" in
git-log(1).
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
prev parent reply other threads:[~2011-07-18 20:39 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
2011-07-18 17:25 ` Patrick Doyle
2011-07-18 20:39 ` Andreas Schwab [this message]
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=m24o2jfhn0.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).