Merge branch 'cp/am-patch-format-doc'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:01:31 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:01:31 +0000 (11:01 -0700)
* cp/am-patch-format-doc:
Documentation/git-am: typofix
Documentation/git-am: Document supported --patch-format options

1  2 
Documentation/git-am.txt
index a2b97582fe010ffcab70db30e006a7a94d6b767b,f8a7d0c85645e92011b12e9b9504a9c3105c7f20..9adce372ec6e6ec0d371c411da1e5002baea5f51
@@@ -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)