Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
  Remove extra '-' from git-am(1)
maint
Junio C Hamano 2010-03-04 22:24:25 -08:00
commit 507665e4f4
1 changed files with 1 additions and 1 deletions

View File

@ -44,7 +44,7 @@ OPTIONS
Remove everything in body before a scissors line (see Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]). linkgit:git-mailinfo[1]).


---no-scissors:: --no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]). Ignore scissors lines (see linkgit:git-mailinfo[1]).


-q:: -q::