Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index ce71838b9e17f3b68dcd19648da3a88dfe4f35bd..d938b422893067feb1a430edb34fb51ef7db6d85 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -245,8 +245,11 @@ patch::
 
        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 and all the remaining hunks in the file
        d - do not stage this hunk nor any of the remaining 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