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

Re: What changed in merge commit?

From
CKChristof Krüger <git@christof-krueger.de>
Date
Jul 18, 2011, 17:10 UTC
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
Previous: Erik Faye-LundNext: Patrick Doyle
Message 3 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.