undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/git-am: Document supported --patch-format options

Browse Source 
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>
This commit is contained in:
Chris Packham 2014-03-11 16:51:57 +13:00 committed by Junio C Hamano
parent 2f93541d88
commit 649813763c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/git-am.txt
View File

@ -12,9 +12,9 @@ SYNOPSIS
'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>] [--directory=<dir>]
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors]
[--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]
[--directory=<dir>] [--exclude=<path>] [--include=<path>]
[--reject] [-q | --quiet] [--[no-]scissors]
[(<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
intepreted as. Valid formats are mbox, stgit, stgit-series and hg.
-i::
--interactive::
Run interactively.