This patch series is build on the top of "cm/rebase-i" in the 'next' branch and improves it. It fixup the source code of 'fixup [-C | -c]' command in the sequencer, do some fixes in rebase -i, improves the 'fixup_-C' like commands in lib-rebase.sh, update the test-script 't3437' and fixes a typo in the documentation. Changes from v2 : * Update the rebase-todo help * Remove the changes and resets to fixup_-* command * Update the documentation of FAKE_LINES * Move the changes of "unnecessary curly braces in test" to the other patch (from v2-9/11 to v2-5/11) Thanks all for the suggestions. Charvi Mendiratta (11): sequencer: fixup the datatype of the 'flag' argument sequencer: rename a few functions rebase -i: clarify and fix 'fixup -c' rebase-todo help t/lib-rebase: update the documentation of FAKE_LINES t/t3437: fixup here-docs in the 'setup' test t/t3437: remove the dependency of 'expected-message' file from tests t/t3437: check the author date of fixed up commit t/t3437: simplify and document the test helpers t/t3437: use named commits in the tests t/t3437: fixup the test 'multiple fixup -c opens editor once' doc/rebase -i: fix typo in the documentation of 'fixup' command Documentation/git-rebase.txt | 2 +- rebase-interactive.c | 9 +-- sequencer.c | 23 +++--- t/lib-rebase.sh | 7 +- t/t3437-rebase-fixup-options.sh | 122 +++++++++++++++++--------------- 5 files changed, 87 insertions(+), 76 deletions(-) -- 2.29.0.rc1
