每个 [y,n,q,a,d,/,K,j,J,g,e,?] 在 git -p 的上下文中代表什么答案

【问题标题】：What does each of the [y,n,q,a,d,/,K,j,J,g,e,?] stand for in context of git -p每个 [y,n,q,a,d,/,K,j,J,g,e,?] 在 git -p 的上下文中代表什么
【发布时间】：2012-05-15 16:52:31
【问题描述】：

当使用git add -p或git stash -p的-p模式时，每个字母代表什么？

我猜y 是肯定的，n 不是。剩下的呢？

[y,n,q,a,d,/,K,j,J,g,e,?]

【问题讨论】：

如果你尝试?选项，你会发现
也许你只需要向上滚动一点？
接受的答案中的打印输出包括输入“？”时未列出的选项

标签： git

【解决方案1】：

-p 模式表示补丁，很难找到它的帮助，但如果您查看git add --help，您会发现以下内容

   patch
       This lets you choose one path out of a status like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can select one of the following options and type return:

           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

【讨论】：

@VicGoldfeld d 将继续下一个文件，而 q 将完全中止该过程？
q 是否不重置任何先前阶段性的更改。无论您已经上演过什么，都会继续上演。
我使用-p 进行存储，不知道您也可以将其用于add！只是为了补充这个答案，虽然提到了 -p | --patch 标志，但这个 cmd：git stash --help 不会像git add --help 那样为您提供有关补丁选项的相同信息。

【解决方案2】：

这些字母的含义可以通过输入? 并按Enter 键找到。对我来说，这些在运行git add --help 时并没有出现。我得到了这些选项的含义如下：-

Arup-iMac:$ git add -p
diff --git a/app/interactors/reporting_groups/list_colleagues.rb b/app/interactors/reporting_groups/list_colleagues.rb
index adc28af..f46f5e3 100644
--- a/app/interactors/reporting_groups/list_colleagues.rb
+++ b/app/interactors/reporting_groups/list_colleagues.rb
@@ -14,7 +14,4 @@ module ReportingGroups
         reporting_group.employees_from_team_sub_reporting_groups
       else
         reporting_group.users
-      end
-    end
-  end
-end
+      
Stage this hunk [y,n,q,a,d,/,e,?]? ? <-- Look here, what I typed to get these.
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
@@ -14,7 +14,4 @@ module ReportingGroups
         reporting_group.employees_from_team_sub_reporting_groups
       else
         reporting_group.users
-      end
-    end
-  end
-end
+      
Stage this hunk [y,n,q,a,d,/,e,?]?

【讨论】：