本質上，git diff當我選擇在互動式 rebase 中拆分大塊時，我想回傳相同的大塊。
我使用的命令是：
git diff -U3 -r -M
它可以產生這樣的東西：
@@ -70,10 70,10 @@
"GetAllDeptJobs2": "None",
"GetAllDeptJobsSlim": "None",
"GetAllDirectDeposits": "Payroll (*)",
- "GetAllEmployeeBenPlanElectedOptions": "None",
"GetAllEmployeeBenPlanElectedOptions": "Benefits (*)",
"GetAllEmployeeConfidentialIdentifications": "HR (*)",
- "GetAllEmployeeDeductionBenElectedRates": "None",
- "GetAllEmployeeEarningBenElectedRates": "None",
"GetAllEmployeeDeductionBenElectedRates": "Benefits (*)",
"GetAllEmployeeEarningBenElectedRates": "Benefits (*)",
"GetAllEmployeeElectedBenefitBeneficiary": "None",
"GetAllEmployeeElectedBenefitBeneficiaryAndDependentData": "None",
"GetAllEmployeeElectedBenefitBeneficiarySL": "None",
相應檔案的相關部分（應用更改后）是：
"GetAllDeptJobs2": "None",
"GetAllDeptJobsSlim": "None",
"GetAllDirectDeposits": "Payroll (*)",
"GetAllEmployeeBenPlanElectedOptions": "Benefits (*)",
"GetAllEmployeeConfidentialIdentifications": "HR (*)",
"GetAllEmployeeDeductionBenElectedRates": "Benefits (*)",
"GetAllEmployeeEarningBenElectedRates": "Benefits (*)",
"GetAllEmployeeElectedBenefitBeneficiary": "None",
"GetAllEmployeeElectedBenefitBeneficiaryAndDependentData": "None",
"GetAllEmployeeElectedBenefitBeneficiarySL": "None",
我想在這兩個大塊頭分開的地方得到一個差異。我意識到第一個大塊的尾隨背景關系與第二個大塊的增量重疊，但那又怎樣？我想得到以下兩個帥哥：
@@ -70,7 70,7 @@
"GetAllDeptJobs2": "None",
"GetAllDeptJobsSlim": "None",
"GetAllDirectDeposits": "Payroll (*)",
- "GetAllEmployeeBenPlanElectedOptions": "None",
"GetAllEmployeeBenPlanElectedOptions": "Benefits (*)",
"GetAllEmployeeConfidentialIdentifications": "HR (*)",
"GetAllEmployeeDeductionBenElectedRates": "None",
"GetAllEmployeeEarningBenElectedRates": "None",
和
@@ -72,10 72,10 @@
"GetAllDirectDeposits": "Payroll (*)",
"GetAllEmployeeBenPlanElectedOptions": "None",
"GetAllEmployeeConfidentialIdentifications": "HR (*)",
- "GetAllEmployeeDeductionBenElectedRates": "None",
- "GetAllEmployeeEarningBenElectedRates": "None",
"GetAllEmployeeDeductionBenElectedRates": "Benefits (*)",
"GetAllEmployeeEarningBenElectedRates": "Benefits (*)",
"GetAllEmployeeElectedBenefitBeneficiary": "None",
"GetAllEmployeeElectedBenefitBeneficiaryAndDependentData": "None",
"GetAllEmployeeElectedBenefitBeneficiarySL": "None",
我明白為什么要git diff批量處理這兩個大塊頭，但是否仍然可以分別獲取它們并成功應用補丁？
uj5u.com熱心網友回復：
雖然這不受git diff（可能U1會起作用？）的直接支持，但它與git add -p( --patch)
通過s為“ smaller”鍵入“ ” ，您將獲得兩個大塊頭而不是一個，并且將能夠應用您的第一組更改，而無需應用第二組。
從那里，您可以從分階段更改生成補丁。
git diff --cached > mypatch.patch
它將只包括第一個大塊。
轉載請註明出處，本文鏈接：https://www.uj5u.com/yidong/378121.html
上一篇：有沒有辦法為Windows制作自己的個性化git命令？
下一篇：理解gitpush語法的含義