Merge branch 'mst/connect'

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index ba18133ead23b0974b8198e25c28ccc746e99954..8eadcebfcf5c26c599cde0d939d1046de69f2335 100644 (file)
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -30,7 +30,7 @@ OPTIONS
        whitespaces, (3) '[' up to ']', typically '[PATCH]', and
        then prepends "[PATCH] ".  This flag forbids this
        munging, and is most useful when used to read back 'git
-       format-patch --mbox' output.
+       format-patch -k' output.
 
 -u::
        The commit log message, author name and author email are