我在Ubuntu 10.04 (Lucid Lynx)上使用Git。
我已经向我的主人许下了一些承诺。
但是，我想知道这些提交之间的区别。它们都在我的主分支上。
例如:
commit dj374
made changes
commit y4746
made changes
commit k73ud
made changes
我想知道k73ud和dj374的区别。然而，当我执行以下操作时，我无法看到我在k73ud中所做的更改。
git diff k73ud..dj374 > master.patch
当前回答
1. git diff <commit-id> <commit-id>
2. git diff HEAD^ HEAD -(HEAD = current branch’s tip),( HEAD^ = version before the last commit)
3. git diff HEAD^ HEAD — ./file (comparison to specified file)
4. git diff HEAD~5 HEAD - (HEAD~5 refers to the last 5 commits.)
其他回答
要查看两个不同提交(我们称它们为a和b)之间的差异，请使用
git diff a..b
注意，a和b的差值与b和a的差值相反。
要查看上次提交的更改和尚未提交的更改之间的差异，请使用
git diff
如果您希望以后能够查看差异，可以将其保存在文件中。
git diff a..b > ../project.diff
看看两者之间的区别:
您的工作副本和暂存区域:
% git diff
暂存区和最新提交:
% git diff --staged
你的工作副本并提交4ac0a6733:
% git diff 4ac0a6733
提交4ac0a6733和最新的提交:
% git diff 4ac0a6733 HEAD
提交4ac0a6733和提交826793951
% git diff 4ac0a6733 826793951
有关更多解释，请参阅官方文档。
假设你在底部(最老的)还有一个提交，那么这就变得很简单了:
commit dj374
made changes
commit y4746
made changes
commit k73ud
made changes
commit oldestCommit
made changes
现在，使用下面的方法将很容易达到目的。
git diff k73ud oldestCommit
1. git diff <commit-id> <commit-id>
2. git diff HEAD^ HEAD -(HEAD = current branch’s tip),( HEAD^ = version before the last commit)
3. git diff HEAD^ HEAD — ./file (comparison to specified file)
4. git diff HEAD~5 HEAD - (HEAD~5 refers to the last 5 commits.)
gitk——所有 选择第一次提交 右键点击另一个，然后diff selected→this
