git diff

git diff

比暂存区与工作区的差别

$ git init
$ echo hello > a.txt
$ cat a.txt
hello

$ git add .
$ git diff

$ echo world >> a.txt
$ cat a.txt
hello
world

$ git diff
diff --git a/a.txt b/a.txt
index ce01362..94954ab 100644
--- a/a.txt
+++ b/a.txt
@@ -1 +1,2 @@
 hello
+world

 

git diff HEAD / commitId

比较版本库与工作区的差别 / 特定提交

$ git add .
$ git commit -m 'commit 1'
[master (root-commit) 2829e03] commit 1
 1 file changed, 2 insertions(+)
 create mode 100644 a.txt

$ cat a.txt
hello
world

$ echo java >> a.txt
$ cat a.txt
hello
world
java


$ git diff HEAD
diff --git a/a.txt b/a.txt
index 94954ab..938ba71 100644
--- a/a.txt
+++ b/a.txt
@@ -1,2 +1,3 @@
 hello
 world
+java

 

git diff --cached

git diff --cached [commit id]

暂存区与版本库之间的差别

$ git diff --cached

$ git add .
$ git diff --cached
diff --git a/a.txt b/a.txt
index 94954ab..938ba71 100644
--- a/a.txt
+++ b/a.txt
@@ -1,2 +1,3 @@
 hello
 world
+java