1. 程式人生 > 其它 >測試開發CICD——Git——window上安裝git——git diff 命令 —— 比較檔案的不同,即比較檔案在暫存區和工作區的差異

測試開發CICD——Git——window上安裝git——git diff 命令 —— 比較檔案的不同,即比較檔案在暫存區和工作區的差異

git diff 命令比較檔案的不同,即比較檔案在暫存區和工作區的差異。

git diff 命令顯示已寫入暫存區和已經被修改但尚未寫入暫存區檔案對區別。

git diff 有兩個主要的應用場景。

  • 尚未快取的改動:git diff
  • 檢視已快取的改動:git diff --cached
  • 檢視已快取的與未快取的所有改動:git diff HEAD
  • 顯示摘要而非整個 diff:git diff --stat

============================================================

此倉庫裡面的檔案是最新clone下來的,工作區與暫存區的一樣:

git diff命令:顯示工作區與暫存區沒有區別

====================================================

此時我在工作區裡面的5.txt裡面增加內容,然後再操作:

=====================================================

我把修改好的5.txt進行git add . 然後再執行git diff命令,就發現沒有區別了:

===================================================

5.txt檔案已經被提交了,現在我再更改工作區的5.txt檔案,然後再執行git diff命令:

===================================================================================

顯示暫存區和工作區的差異:

$ git diff [file]

======================================================

顯示暫存區和上一次提交(commit)的差異:

$ git diff --cached [file]

$ git diff --staged [file]

=============================================================

看已快取的與未快取的所有改動:git diff HEAD

===================================================

顯示兩次提交之間的差異:

$ git diff [first-branch]...[second-branch]

==========================================================

  • 顯示摘要而非整個 diff:git diff --stat

==========================================================