Merge branch 'maint-1.6.6' into maint

* maint-1.6.6: Remove extra '-' from git-am(1)
luceliu · Mar 5, 2010 · 507665e · 507665e
2 parents 511da22 + e8a285e
commit 507665e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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::