Merge branch 'maint-1.6.5' into maint-1.6.6

* maint-1.6.5:
  Remove extra '-' from git-am(1)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 67ad5da9cc0e766882300e90ed114306cb3c9fa7..40178be92278407465ba539b94292b4632c2132d 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -44,7 +44,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::