Documentation/git-am: Document supported --patch-format options
The --patch-format option has been supported for a while but it is not mentioned in the man page and the short help cannot tell the user what the supported formats are. Add the option to the man page along with the supported options. Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Chris Packham committed
Mar 11, 2014 at 16:51 UTC
649813763c58421d6fdbc57b651e4d46f26f1fea
1 file changed
+9
-3
Documentation/git-am.txt
+9
-3
@@ -12,9 +12,9 @@ SYNOPSIS
12
'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
13
[--3way] [--interactive] [--committer-date-is-author-date]
14
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
15
- [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
16
- [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
17
- [--[no-]scissors]
15
+ [--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]
16
+ [--directory=<dir>] [--exclude=<path>] [--include=<path>]
17
+ [--reject] [-q | --quiet] [--[no-]scissors]
18
[(<mbox> | <Maildir>)...]
19
'git am' (--continue | --skip | --abort)
20
@@ -97,6 +97,12 @@ default. You can use `--no-utf8` to override this.
97
program that applies
98
the patch.
99
100
+--patch-format::
101
+ By default the command will try to detect the patch format
102
+ automatically. This option allows the user to bypass the automatic
103
+ detection and specify the patch format that the patch(es) should be
104
+ intepreted as. Valid formats are mbox, stgit, stgit-series and hg.
105
+
106
-i::
107
--interactive::
108
Run interactively.