Git：如何在合并提交中找出真正更改的文件？

Question

Conflict filenames are included in auto-generated commit message.

Beside conflict files, if someone makes changes to other files in a merge commit, it is worth noticing the changes to trace why he makes such changes in a merge commit.

If no conflicts, a merge commit should have no real file changes, because each file follows either parent.

What git command line should I type?

I need changed file names only, not diff content.

Answer 1

If you git show a merge commit, it will show you only that merge commit's changes. Every other change produced by one of the "merged commits" will be shown by git show ing that commit.

Answer 2

git show --stat将显示合并提交本身触及的文件名的摘要。