每个[y,n,q,a,d，/，K,j, j, g,e，，?]在git -p上下文中表示

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

我猜y是yes，而n是no。剩下的是什么?

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

63226 次浏览
小开
最佳答案

-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
小开

可以通过输入?并按输入键来查找这些字母的含义。对我来说，当运行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,?]?

提交答案