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

What changed in merge commit?

From
PDPatrick Doyle <wpdster@gmail.com>
Date
Jul 18, 2011, 16:44 UTC
Message-ID
<CAF_dkJC-ee2Bqyi2_Fx_j8mu3tCFsV8o=xMRLjx+s2di4=HfkQ@mail.gmail.com>

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.

Perhaps nothing changed between the last time I merged with origin/master and the current time. I know that at least one change was committed. I suppose it's possible that two (or more) changes were committed, undoing that one change. (But I don't think that's likely).

I could go back and look at the log for origin/master... and I'm sure there's some way to say "just give me the log of changes since the last time I merged", or more to the point now, "just give me the log of changes since the time before the last time I merged". It probably has something to do with a couple of ref names, a caret, and some dots, but I get lost in all of that syntax.

Thanks for the tips.
--wpd
Next: Erik Faye-Lund
Message 1 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.