G:\mygitea\GitLearn\learn03 master ± $ git diff diff --git a/readme b/readme index edd02cd..4dd1fab 100644 --- a/readme +++ b/readme @@ -4,3 +4,4 @@ This is the young branch. after test, update readme. test HEAD and cached compare fix 2. 2 +123445 diff --git a/test.txt b/test.txt index f29dee6..4debe7e 100644 --- a/test.txt +++ b/test.txt @@ -1 +1,2 @@ 测试 +222
G:\mygitea\GitLearn\learn03 master ± $ git diff -- readme diff --git a/readme b/readme index edd02cd..4dd1fab 100644 --- a/readme +++ b/readme @@ -4,3 +4,4 @@ This is the young branch. after test, update readme. test HEAD and cached compare fix 2. 2 +123445
总结
1 2 3 4
假定:HEAD、缓存区、工作区中的readme.md文件内容均不相同。 git diff HEAD -- readme.md # 工作区 <===> HEAD git diff -- readme.md # 工作区 <===> 缓存区 git diff --cached -- readme.md # 缓存区 <===> HEAD