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

Re: What changed in merge commit?

From
Erik Faye-Lund <kusmabite@gmail.com>
Date
Jul 18, 2011, 16:52 UTC
Message-ID
<CABPQNSaOQxBqf34_799zc46EnHsc7L3BiSATyYq+Q6oGs0H6sw@mail.gmail.com>
In-Reply-To
<CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com>
On Mon, Jul 18, 2011 at 6:44 PM, Patrick Doyle <wpdster@gmail.com> wrote:
Show 12 quoted lines
> Since today seems to be my day to hang out on this list, I thought I'd
> ask another burning question...
>
> How can I see what changed in a merge commit?
>
> $ git log
>
> just says "merge remote branch 'origin/master' into wpd" and
>
> $ git log --name-status
>
> says the same thing -- it doesn't list any files as having changed.

That's because nothing did change; it's the merge's parents that are the commits that changed something. If there was a fix-up (either due to a merge-conflict or an explicitly squashed-in change), then that would show up for the merge-commit.

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.

Previous: Patrick DoyleNext: Christof Krüger
Message 2 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.