diff options
| author | 徐沛文 (Aleen) <aleen42@vip.qq.com> | 2021-12-09 08:25:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-16 02:04:19 +0100 |
| commit | 9e7e41bf19ed10469f9adb60669b1699c81b8ea6 (patch) | |
| tree | 38c8ff55fb6b3b4280b09c6b87dcbdfa96da0d3a /t/t7512-status-help.sh | |
| parent | am: support --empty=<option> to handle empty patches (diff) | |
| download | git-9e7e41bf19ed10469f9adb60669b1699c81b8ea6.tar.xz git-9e7e41bf19ed10469f9adb60669b1699c81b8ea6.zip | |
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 't/t7512-status-help.sh')
| -rwxr-xr-x | t/t7512-status-help.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 7f2956d77a..2f16d5787e 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -659,6 +659,7 @@ On branch am_empty You are in the middle of an am session. The current patch is empty. (use "git am --skip" to skip this patch) + (use "git am --allow-empty" to record this patch as an empty commit) (use "git am --abort" to restore the original branch) nothing to commit (use -u to show untracked files) |