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

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

Junio C Hamano committed Mar 25, 2014 at 11:01 UTC 2dfefe0f89447ff4f358d5f294c0b56148a0df4c

No changes.