diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
| commit | e872a1cfb365aa9016e685705d691f75c4585220 (patch) | |
| tree | 0cd8bbdef3f464a809208b7f0c3de532d991b2f5 /git-am.txt | |
| parent | 05fe8d182bb7801152b0db4240ccc5643720f773 (diff) | |
| download | git-htmldocs-e872a1cfb365aa9016e685705d691f75c4585220.tar.gz | |
Autogenerated HTML docs for v2.34.1-493-ge83ba
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index 0a4a984df..09107fb10 100644 --- a/git-am.txt +++ b/git-am.txt @@ -16,8 +16,9 @@ SYNOPSIS [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [--quoted-cr=<action>] + [--empty=(stop|drop|keep)] [(<mbox> | <Maildir>)...] -'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty) DESCRIPTION ----------- @@ -63,6 +64,14 @@ OPTIONS --quoted-cr=<action>:: This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]). +--empty=(stop|drop|keep):: + By default, or when the option is set to 'stop', the command + errors out on an input e-mail message lacking a patch + and stops into the middle of the current am session. When this + option is set to 'drop', skip such an e-mail message instead. + When this option is set to 'keep', create an empty commit, + recording the contents of the e-mail message as its log. + -m:: --message-id:: Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), @@ -191,6 +200,11 @@ default. You can use `--no-utf8` to override this. the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`. +--allow-empty:: + After a patch failure on an input e-mail message lacking a patch, + create an empty commit with the contents of the e-mail message + as its log message. + DISCUSSION ---------- |