diff options
| author | 徐沛文 (Aleen) <aleen42@vip.qq.com> | 2021-12-09 07:25:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 17:04:19 -0800 |
| commit | 9e7e41bf19ed10469f9adb60669b1699c81b8ea6 (patch) | |
| tree | 38c8ff55fb6b3b4280b09c6b87dcbdfa96da0d3a /Documentation/git-am.txt | |
| parent | 7c096b8d61e1276acb6f84bf446cfe74578382a0 (diff) | |
| download | git-9e7e41bf19ed10469f9adb60669b1699c81b8ea6.tar.gz | |
am: support --allow-empty to record specific empty patches
This option helps to record specific empty patches in the middle
of an am session, which does create empty commits only when:
1. the index has not changed
2. lacking a branch
When the index has changed, "--allow-empty" will create a non-empty
commit like passing "--continue" or "--resolved".
Signed-off-by: 徐沛文 (Aleen) <aleen42@vip.qq.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 7676bd58ae..09107fb106 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -18,7 +18,7 @@ SYNOPSIS [--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 ----------- @@ -200,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 ---------- |