diff options
| author |  Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:44 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:16:22 -0700 |
| commit | a58088abe2011b6f486de8acd54432f6d9bcecfc (patch) | |
| tree | fdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/git-add.txt | |
| parent | Git 1.9.1 (diff) | |
| download | tgif-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.xz | |
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-add.txt')
| -rw-r--r-- | Documentation/git-add.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 48754cbc67..f3ab3748bc 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -296,9 +296,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 |