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

What should I do to display the diff of even a simple merge commit?

From
Christian MICHON <christian.michon@gmail.com>
Date
Feb 9, 2010, 23:45 UTC
Message-ID
<46d6db661002091545j74f625ffr74ca70a0474948fc@mail.gmail.com>
Hi list,

I'm performing many merges between developpers branches these days, most of them not yielding into conflicts. (understand: simple merges)

All is good, but sometimes, I would like to really like what has been changed.

As I do not systematically do this "git merge --no-commit --stat <list_to_merge>" and then fire "git gui" to inspect the diffs before the real commit, I'm wondering: how could I do this using some plumbing ?

Right now, I've tried the obvious git log -c -p, git show -u --cc, but since the merge are simple merges, I cannot get any diff output. I believe this is by construction.

Any hints ?
Thanks in advance.
-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !
Next: Christian MICHON
Message 1 of 9 in “What should I do to display the diff of even a simple merge commit?”
  1. Christian MICHONFeb 9, 2010
  2. Christian MICHONFeb 9, 2010
  3. Petr BaudisFeb 9, 2010
  4. Junio C HamanoFeb 10, 2010
  5. git log -p -m: Document, honor --first-parentPetr Baudis, Feb 10, 2010
  6. Junio C HamanoFeb 10, 2010
  7. Petr BaudisFeb 10, 2010
  8. Junio C HamanoFeb 10, 2010
  9. Christian MICHONFeb 10, 2010

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.