Merge branch 'maint-1.6.5' into maint-1.6.6

* maint-1.6.5:
  Remove extra '-' from git-am(1)
This commit is contained in:
Junio C Hamano 2010-03-04 22:24:19 -08:00
commit e8a285e553

View File

@ -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::