基本概述

git diff的作用是：比較代碼差異

基本用法

1.工作區 VS 暫存區

git diff [file]

2.暫存區 VS 最新提交

git diff --staged [file]
# 或
git diff --cached [file]

3.工作區 VS 最新提交

git diff HEAD [file]

高級用法

1.比較兩個提交間的差異

git diff commit1 commit2

• 例子：比較某次提交與其父提交的差異

git diff commit^ commit # 等價于 git show commit

2.比較兩個分支的最新提交

git diff branch1 branch2

• 例子：比較本地分支與其遠程跟蹤分支

git diff @{upstream}
# 或明確指定分支
git diff origin/main

3.比較兩個標簽的差異

git diff v1.0 v2.0

4.生成補丁文件

git diff > changes.patch

常用選項

1.查看指定行差異

git diff -L 10,20:file.txt

2.顯示未解決的合并沖突差異

git diff --merge-base

3.生成二進制文件的補丁

git diff --binary HEAD~1 HEAD > bin.patch