diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-26 14:59:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-26 14:59:03 -0700 |
| commit | fde07fc356783bd05695cd3826844f1590ac2e45 (patch) | |
| tree | c47665b481071682bc1b97c0f627eed34bec81fc /t/lib-rebase.sh | |
| parent | ce4296cf2b6f66d8717e8c3237c9b4be42fb2a1b (diff) | |
| parent | fa153c1cd7a84accc83e97723af85cf0ab3869e7 (diff) | |
| download | git-fde07fc356783bd05695cd3826844f1590ac2e45.tar.gz | |
Merge branch 'cm/rebase-i-updates'
Follow-up fixes to "cm/rebase-i" topic.
* cm/rebase-i-updates:
doc/rebase -i: fix typo in the documentation of 'fixup' command
t/t3437: fixup the test 'multiple fixup -c opens editor once'
t/t3437: use named commits in the tests
t/t3437: simplify and document the test helpers
t/t3437: check the author date of fixed up commit
t/t3437: remove the dependency of 'expected-message' file from tests
t/t3437: fixup here-docs in the 'setup' test
t/lib-rebase: update the documentation of FAKE_LINES
rebase -i: clarify and fix 'fixup -c' rebase-todo help
sequencer: rename a few functions
sequencer: fixup the datatype of the 'flag' argument
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 27928ecb94..dc75b83451 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -15,10 +15,11 @@ # specified line. # # "<cmd> <lineno>" -- add a line with the specified command -# ("pick", "squash", "fixup", "edit", "reword" or "drop") and the -# SHA1 taken from the specified line. +# ("pick", "squash", "fixup"|"fixup_-C"|"fixup_-c", "edit", "reword" or "drop") +# and the SHA1 taken from the specified line. # -# "exec_cmd_with_args" -- add an "exec cmd with args" line. +# "_" -- add a space, like "fixup_-C" implies "fixup -C" and +# "exec_cmd_with_args" add an "exec cmd with args" line. # # "#" -- Add a comment line. # |