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?hp=3f09db07b3dc0758756fad73c96abd0e47cbcd1b

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 --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index a2b97582fe..9adce372ec 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
 	 [--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 @@ default.   You can use `--no-utf8` to override this.
 	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.