diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-25 12:54:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 12:54:38 -0700 |
| commit | 3214e5f10c469804fcdd6096f3c3f32098ae9052 (patch) | |
| tree | e5d0d5a19675447f6eb86a18b524343a608e1db7 /git-am.txt | |
| parent | 7c59c67912d7b4c6aec60b899ba560b47de6a034 (diff) | |
| download | git-htmldocs-3214e5f10c469804fcdd6096f3c3f32098ae9052.tar.gz | |
Autogenerated HTML docs for v1.9.1-352-gd393d
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index a2b97582f..9adce372e 100644 --- a/git-am.txt +++ b/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. |