我喜欢下面的命令来比较特定的提交和上次提交：

git diff <commit-hash>^-

例子：

git diff cd1b3f485^-

此命令将获取Git父提交哈希：

git log -n 2 <commit-hash>

之后，gitdiff工具<commithash><parentcommithash>

例子：

bonnie@bonnie ~/ $ git log -n 2 7f65b9a9d3820525766fcba285b3c678e889fe3

commit 7f65b9a9d3820525766fcba285b3c678e889fe3b
Author: souparno <souparno.majumder@gmail.com>
Date:   Mon Jul 25 13:17:07 2016 +0530

CSS changed to maintain the aspect ratio of the channel logos and to fit them properly.

commit c3a61f17e14e2b80cf64b172a45f1b4826ee291f
Author: souparno <souparno.majumder@gmail.com>
Date:   Mon Jul 25 11:28:09 2016 +0530

The ratio of the height to width of the channel images are maintained.

在此之后

git difftool 7f65b9a9d3820525766fcba285b3c678e889fe3b c3a61f17e14e2b80cf64b172a45f1b4826ee291f

以下内容似乎可以完成任务：；我用它来显示合并带来了什么。

git whatchanged -m -n 1 -p <SHA-1 hash of merge commit>

检查文件更改的更简单方法（示例）

# 1. Checkout a branch and see the list of commits
git log --oneline -5

# > Output
9b9b1f8 (HEAD -> master) Updated ABC
d58e5da chore: Added files
5a4aa2c chore: Added my pipeline
bb2b0b7 feat: Added ABC
473f711 feat: Added ZYX

# 2. Pick a commit hash and check which files were modified
git show --stat --oneline d58e5da

# > Output
d58e5da chore: Added versioning files
 Someabcfile                            | 18 ++++++++++++++++++
 myfolder/file.py                       | 19 +++++++++++++++++++
 myfolder/file.js                       |  7 +++++++
 myfolder/file.txt                      |  1 +
 4 files changed, 45 insertions(+)

# 3. Pick a file to check the differences
git show d58e5da myfolder12/file.py

或者，从列表中检查一次提交中的所有文件差异：

git show d58e5da

git difftool COMMIT^ <commit hash>

如果您配置了difftool，也可以使用。

请参阅此处如何配置difftool。或此处的手册页。

此外，您可以使用git diff树--no commit id--name only-r＜commit hash＞来查看在给定的提交哈希中更改/提交了哪些文件。

以下代码将显示当前提交

git show HEAD