From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Mar 2010 06:24:19 +0000 (-0800)
Subject: Merge branch 'maint-1.6.5' into maint-1.6.6
X-Git-Tag: v1.7.0.2~15^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e8a285e553f8c6c04820a542b2a28816a9d62d3c?hp=97a449ee3031e8d128190b7f53a21c7688f73ec9

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 67ad5da9cc..40178be922 100644
--- 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::