Merge branch 'cp/am-patch-format-doc'

* cp/am-patch-format-doc:
Documentation/git-am: typofix
Documentation/git-am: Document supported --patch-format options

diff --combined Documentation/git-am.txt
index a2b97582fe010ffcab70db30e006a7a94d6b767b,f8a7d0c85645e92011b12e9b9504a9c3105c7f20..9adce372ec6e6ec0d371c411da1e5002baea5f51
--- 1/Documentation/git-am.txt
--- 2/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -12,9 -12,9 +12,9 @@@ SYNOPSI
  'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
         [--3way] [--interactive] [--committer-date-is-author-date]
         [--ignore-date] [--ignore-space-change | --ignore-whitespace]
 -       [--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]
 -       [--directory=<dir>] [--exclude=<path>] [--include=<path>]
 -       [--reject] [-q | --quiet] [--[no-]scissors]
 +       [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
 +       [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
-        [--[no-]scissors] [-S[<keyid>]]
++       [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
         [(<mbox> | <Maildir>)...]
  'git am' (--continue | --skip | --abort)
  
@@@ -97,6 -97,12 +97,12 @@@ default.   You can use `--no-utf8` to o
        program that applies
        the patch.
  
+ --patch-format::
+       By default the command will try to detect the patch format
+       automatically. This option allows the user to bypass the automatic
+       detection and specify the patch format that the patch(es) should be
+       interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
+ 
  -i::
  --interactive::
        Run interactively.
@@@ -119,10 -125,6 +125,10 @@@
        Skip the current patch.  This is only meaningful when
        restarting an aborted patch.
  
 +-S[<keyid>]::
 +--gpg-sign[=<keyid>]::
 +      GPG-sign commits.
 +
  --continue::
  -r::
  --resolved::
@@@ -193,11 -195,6 +199,11 @@@ commits, like running 'git am' on the w
  commits that is more easily fixed by changing the mailbox (e.g.
  errors in the "From:" lines).
  
 +HOOKS
 +-----
 +This command can run `applypatch-msg`, `pre-applypatch`,
 +and `post-applypatch` hooks.  See linkgit:githooks[5] for more
 +information.
  
  SEE ALSO
  --------