mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'cp/am-patch-format-doc'
* cp/am-patch-format-doc: Documentation/git-am: typofix Documentation/git-am: Document supported --patch-format options
This commit is contained in:
commit
2dfefe0f89
|
@ -14,7 +14,7 @@ SYNOPSIS
|
||||||
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
|
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
|
||||||
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
|
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
|
||||||
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
|
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
|
||||||
[--[no-]scissors] [-S[<keyid>]]
|
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
|
||||||
[(<mbox> | <Maildir>)...]
|
[(<mbox> | <Maildir>)...]
|
||||||
'git am' (--continue | --skip | --abort)
|
'git am' (--continue | --skip | --abort)
|
||||||
|
|
||||||
|
@ -97,6 +97,12 @@ default. You can use `--no-utf8` to override this.
|
||||||
program that applies
|
program that applies
|
||||||
the patch.
|
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::
|
-i::
|
||||||
--interactive::
|
--interactive::
|
||||||
Run interactively.
|
Run interactively.
|
||||||
|
|
Loading…
Reference in a new issue