Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 48754cbc67a2cc3819fac272cdef9d9d0d76c0d7..f3ab3748bc4311b44099ad650521adcb667085de 100644 (file)
--- 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