1. 程式人生 > 其它 >git深入理解(三):git diff詳解

git深入理解(三):git diff詳解

技術標籤:雜項

Show changes between commits, commit and working tree, etc

是一個用來檢視差異的工具。

檢視幫助

$ git diff -h
usage: git diff [<options>] [<commit> [<commit>]] [--] [<path>...]

資訊量過少

比較工作區和暫存區的差別

git diff 
或者
git diff filename

比較暫存區和本庫的差別

git diff --cached 
或者
git diff --cached  filename

(
Git 1.6.1 及更高版本還允許使用 git diff --staged,效果是相同的)

比較工作區和版本庫的差別

git diff HEAD 

比較兩個分支上最新的提交

git diff topic master

比較上次commit和上上次commit

git diff HEAD^ HEAD

比較兩個具體commit之間的差異

git diff 818c5faf28d0a0e5c8133dbd77dd24e6e70db9bf 2e1b4bced0f0ce2c20362789be2878b36c6910f7

自從某個版本之後都改的了什麼

git diff [version tag]

git
diff f2b85bf7f7516a6a6a0768e44266d09414b03a2e

比較兩個分支

git diff [branchA][branchB]