From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:01:31 +0000 (-0700)
Subject: Merge branch 'cp/am-patch-format-doc'
X-Git-Tag: v2.0.0-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2dfefe0f89447ff4f358d5f294c0b56148a0df4c

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

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

2dfefe0f89447ff4f358d5f294c0b56148a0df4c
diff --cc Documentation/git-am.txt
index a2b97582fe,f8a7d0c856..9adce372ec
--- a/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)