Git 补丁 diff

Git 补丁

打补丁

工作区与当前分支的差异

# 不会打Untracked 未追踪的文件， 建议git add 到暂存区后再打补丁
git diff --cached > diff.patch
git diff --stage > diff.patch

指定提交ID打补丁

# 0c8d4035 提交的补丁
git diff 0c8d4035^ 0c8d4035 > diff.patch

应用补丁1

git apply diff.patch

应用补丁2

• 先检查patch文件：git apply --stat newpatch.patch
• 检查能否应用成功：git apply --check newpatch.patch
• 打补丁：git am --signoff < newpatch.patch