git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What changed in merge commit?

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Jul 18, 2011, 20:39 UTC
Message-ID
<m24o2jfhn0.fsf@igel.home>
In-Reply-To
<CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com>
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."
Previous: Patrick Doyle
Message 5 of 5 in “What changed in merge commit?”
  1. Patrick DoyleJul 18, 2011
  2. Erik Faye-LundJul 18, 2011
  3. Christof KrügerJul 18, 2011
  4. Patrick DoyleJul 18, 2011
  5. Andreas SchwabJul 18, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.