Merge branch 'cp/am-patch-format-doc'
commit2dfefe0f89447ff4f358d5f294c0b56148a0df4c
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:01:31 +0000 (25 11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:01:31 +0000 (25 11:01 -0700)
treec8960d5ae5c6a5f8e3b3103960734f98cbc7326a
parent3f09db07b3dc0758756fad73c96abd0e47cbcd1b
parentf5b6ffad83469f6f3bb2afaede1c15ed6125fcb6
Merge branch 'cp/am-patch-format-doc'

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