Merge branch 'maint-1.6.6' into maint

* maint-1.6.6: Remove extra '-' from git-am(1)
2010-03-04 22:24:25 -08:00 · 2010-03-04 22:24:25 -08:00 · 507665e4f4
parent 511da22ecf e8a285e553
commit 507665e4f4
1 changed files with 1 additions and 1 deletions
--- 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::