summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 12:00:27 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-08 12:00:28 -0700
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /git-add--interactive.perl
parent9b30a0339db28e6de9653b5631247d398cce626c (diff)
parent235e8d591480d7e1378c27fe65c5529625d4b5be (diff)
downloadgit-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index d3bca12611..1fadd69f88 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1159,9 +1159,9 @@ sub help_patch_cmd {
print colored $help_color, <<EOF ;
y - $verb this hunk$target
n - do not $verb this hunk$target
-q - quit; do not $verb this hunk nor any of the remaining ones
+q - quit; do not $verb this hunk or any of the remaining ones
a - $verb this hunk and all later hunks in the file
-d - do not $verb this hunk nor any of the later hunks in the file
+d - do not $verb this hunk or 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