diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-27 00:59:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-27 00:59:03 +0300 |
| commit | fde07fc356783bd05695cd3826844f1590ac2e45 (patch) | |
| tree | c47665b481071682bc1b97c0f627eed34bec81fc /Documentation | |
| parent | ce4296cf2b6f66d8717e8c3237c9b4be42fb2a1b (diff) | |
| parent | fa153c1cd7a84accc83e97723af85cf0ab3869e7 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index a6903419c4..8bfa5a9272 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -894,7 +894,7 @@ is used. In that case the suggested commit message is only the message of the "fixup -c" commit, and an editor is opened allowing you to edit the message. The contents (patch) of the "fixup -c" commit are still incorporated into the folded commit. If there is more than one "fixup -c" -commit, the message from the last last one is used. You can also use +commit, the message from the final one is used. You can also use "fixup -C" to get the same behavior as "fixup -c" except without opening an editor. |