git - 如何中止 git add -p 丢弃更改？

Question

我运行git add了一些文件，构成了一组逻辑上的单独更改，对它们进行了其他更改，并使用git add -p. 进行到一半，我意识到我还没有提交上一组。

的交互式帮助git add -p仅提供以下选项：

Stage this hunk [y,n,q,a,d,/,s,e,?]? ?
y - stage this hunk
n - do not stage this hunk
q - quit; do not stage this hunk nor any of the remaining ones
a - stage this hunk and all later hunks in the file
d - do not stage this hunk nor any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help

如何重置添加的补丁？

Answer 1

git add -p阶段更改而不存储历史记录，这可用于恢复添加。但是，您可以使用git reset -p或git reset --patch取消暂存更改。一个过程看起来如下：

• enterq
  退出交互git add -p
• git reset -p
  重置所有错误添加的更改
• git commit
  提交第一个变更集
• git add -p
  再次，将更改添加到新的第二次提交
• git commit
  提交第二次提交