Merge branch 'maint-1.6.6' into maint

* maint-1.6.6:
Remove extra '-' from git-am(1)

diff --combined Documentation/git-am.txt
index c66c565bbe3d0e25ded50786e5503b749ad72163,40178be92278407465ba539b94292b4632c2132d..23864df8da0694a0daefb81fe629e22a1deb06f1
--- 1/Documentation/git-am.txt
--- 2/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -15,7 -15,7 +15,7 @@@ SYNOPSI
         [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
         [--reject] [-q | --quiet] [--scissors | --no-scissors]
         [<mbox> | <Maildir>...]
 -'git am' (--skip | --resolved | --abort)
 +'git am' (--continue | --skip | --abort)
  
  DESCRIPTION
  -----------
@@@ -37,14 -37,14 +37,14 @@@ OPTION
  
  -k::
  --keep::
 -      Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
 +      Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
  
  -c::
  --scissors::
        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::
@@@ -53,7 -53,7 +53,7 @@@
  
  -u::
  --utf8::
 -      Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
 +      Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
        The proposed commit log message taken from the e-mail
        is re-coded into UTF-8 encoding (configuration variable
        `i18n.commitencoding` can be used to specify project's
@@@ -63,7 -63,7 +63,7 @@@ This was optional in prior versions of 
  default.   You can use `--no-utf8` to override this.
  
  --no-utf8::
 -      Pass `-n` flag to 'git-mailinfo' (see
 +      Pass `-n` flag to 'git mailinfo' (see
        linkgit:git-mailinfo[1]).
  
  -3::
@@@ -81,7 -81,7 +81,7 @@@
  -p<n>::
  --directory=<dir>::
  --reject::
 -      These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
 +      These flags are passed to the 'git apply' (see linkgit:git-apply[1])
        program that applies
        the patch.
  
@@@ -107,7 -107,6 +107,7 @@@
        Skip the current patch.  This is only meaningful when
        restarting an aborted patch.
  
 +--continue::
  -r::
  --resolved::
        After a patch failure (e.g. attempting to apply
@@@ -122,7 -121,7 +122,7 @@@
        to the screen before exiting.  This overrides the
        standard message informing you to use `--resolved`
        or `--skip` to handle the failure.  This is solely
 -      for internal use between 'git-rebase' and 'git-am'.
 +      for internal use between 'git rebase' and 'git am'.
  
  --abort::
        Restore the original branch and abort the patching operation.