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

Distinguishing trivial and non-trivial merge commits

From
Eli Barzilay <eli@barzilay.org>
Date
Apr 30, 2010, 16:35 UTC
Message-ID
<19419.1721.763210.679444@winooski.ccs.neu.edu>

I'm trying to get a goot notification script, and got stuck with merge commits. My script shows a list of modifications for each commit (based on the diffstat output) -- and if I show all commits, then merges are misleading in that a quick glance through the email makes it look like a lot more was touched. Using `--no-merges' helps in avoiding the confusing parts, but that's dangerous in omitting non-trivial merges too -- and those are probably even more worth noting than other changes (just because they'll highlights changes that are "hotter" in the sense of more people working on that code).

The only way I've seen to distinguish the two is to use `git show' and see if there is no diff output (eg, "git show --pretty=format: $rev"). But that doesn't help in getting the list of modified files. So I add `--stat' to that, and that goes back to showing all files again, the same stuff that "git diff $rev^!" shows.

Is there *any* way to get `git diff --stat' to do the same thing that `git show' does? (Or a way to get `git show --stat' not show all files again...)

-- 
          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                    http://barzilay.org/                   Maze is Life!
Next: Jonathan Nieder
Message 1 of 8 in “Distinguishing trivial and non-trivial merge commits”
  1. Eli BarzilayApr 30, 2010
  2. Jonathan NiederMay 2, 2010
  3. Eli BarzilayMay 2, 2010
  4. Jakub NarebskiMay 2, 2010
  5. Eli BarzilayMay 2, 2010
  6. Junio C HamanoMay 2, 2010
  7. Eli BarzilayMay 2, 2010
  8. Jonathan NiederMay 2, 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.