git工作流程
上图是git简单工作流,这意味比较差异的命令至少需要支持三个维度的比较:
- 工作区和暂存区的差异
- 工作区和git版本库的差异
- 暂存区和git版本库的差异
- 工作区和暂存区比较
命令:
git diff
[root@192 demo]# git diff
diff --git a/welcome.txt b/welcome.txt
index 7dc33a5..2980adf 100644
--- a/welcome.txt
+++ b/welcome.txt
@@ -1,2 +1,3 @@
Hello.
nice to meet you.
+add one line.
- 暂存区和git版本库比较
命令:
git diff --cached
或者
git diff --staged
- 工作区和版本库比较
git diff HEAD
差异命令概括图如下: