在 git -p 的上下文中,每个 [y,n,q,a,d,/,K,j,J,g,e,?] 代表什么
声明:本页面是StackOverFlow热门问题的中英对照翻译,遵循CC BY-SA 4.0协议,如果您需要使用它,必须同样遵循CC BY-SA许可,注明原文地址和作者信息,同时你必须将它归于原作者(不是我):StackOverFlow
原文地址: http://stackoverflow.com/questions/10605405/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
What does each of the [y,n,q,a,d,/,K,j,J,g,e,?] stand for in context of git -p
提问by chrisjlee
When using -p mode of git add -p
or git stash -p
what does each of the letters stand for?
使用 -p 模式时git add -p
或git stash -p
每个字母代表什么?
I'm guessing y
is yes and n
is no. What are the rest?
我猜y
是和n
不是。剩下的是什么?
[y,n,q,a,d,/,K,j,J,g,e,?]
[y,n,q,a,d,/,K,j,J,g,e,?]
回答by AD7six
The -p
mode means patch, the help for which is hard-ish to find, but if you check git add --help
you'll find the following
该-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
回答by Arup Rakshit
The meaning of these letters can be found by typing ?and hit the Enterkey. For me these didn't come when run git add --help
. I got the meaning of these options as below :-
这些字母的含义可以通过键入? 并按Enter键。对我来说,这些在 run 时没有出现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,?]?