Merge branch 'np/malloc-threading'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 70bc698a356b13425437418498ec577858304953..9e62f8778f6590328de4d9c0c7c08044e8019eac 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -51,7 +51,7 @@ OPTIONS
        Remove everything in body before a scissors line (see
        linkgit:git-mailinfo[1]).
 
----no-scissors::
+--no-scissors::
        Ignore scissors lines (see linkgit:git-mailinfo[1]).
 
 -q::