summaryrefslogtreecommitdiff
path: root/Documentation/git-add.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 19:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-08 19:00:28 (GMT)
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /Documentation/git-add.txt
parent9b30a0339db28e6de9653b5631247d398cce626c (diff)
parent235e8d591480d7e1378c27fe65c5529625d4b5be (diff)
downloadgit-d59c12d7ad39f942fc60578ba1e934822f40445b.zip
git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz
git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.bz2
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 'Documentation/git-add.txt')
-rw-r--r--Documentation/git-add.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 895922e..9631526 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -300,9 +300,9 @@ patch::
y - stage this hunk
n - do not stage this hunk
- q - quit; do not stage this hunk nor any of the remaining ones
+ q - quit; do not stage this hunk or 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
+ d - do not stage 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