diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-25 11:01:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 11:01:31 -0700 |
| commit | 2dfefe0f89447ff4f358d5f294c0b56148a0df4c (patch) | |
| tree | c8960d5ae5c6a5f8e3b3103960734f98cbc7326a /Documentation | |
| parent | Update draft release notes to 2.0 (diff) | |
| parent | Documentation/git-am: typofix (diff) | |
| download | tgif-2dfefe0f89447ff4f358d5f294c0b56148a0df4c.tar.xz | |
Merge branch 'cp/am-patch-format-doc'
* cp/am-patch-format-doc:
Documentation/git-am: typofix
Documentation/git-am: Document supported --patch-format options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-am.txt | 8 |
1 files changed, 7 insertions, 1 deletions
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. |