Merge branch 'pt/pull-log-n' into maint

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index f2eb9076d73d830c19dc70bf2175e55a46ae1111..fe5282f1305902545eaff585ced432d296dd64f4 100644 (file)
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -93,7 +93,8 @@ This effectively runs `add --interactive`, but bypasses the
 initial command menu and directly jumps to the `patch` subcommand.
 See ``Interactive mode'' for details.
 
--e, \--edit::
+-e::
+--edit::
        Open the diff vs. the index in an editor and let the user
        edit it.  After the editor was closed, adjust the hunk headers
        and apply the patch to the index.