[TOC] ## 場景 ### 比較工作區與暫存區 ``` git diff ``` ### 比較暫存區與最新本地版本庫 ``` git diff --cached [<path>...] ``` ### 比較工作區與最新本地版本庫 ``` git diff HEAD [<path>...] ``` ### 比較工作區與指定commit-id的差異 ``` git diff commit-id [<path>...] ``` ### 比較兩個commit-id之間的差異 ``` git diff [<commit-id>] [<commit-id>] ``` ### 使用git diff打補丁 ``` //生成文件 git diff > patch git diff --cached > patch git diff --HEAD > patch git diff Testfile > patch // //將單個文件做成一個單獨的補丁 // 應用補丁 git apply --check patch // 如果沒有任何輸出，那么表示可以順利接受這個補丁 git apply --reject patch // 將能打的補丁先打上，有沖突的會生成.rej文件