[PATCH 0/1] rebase: add --[no-]edit to --continue
Hugo Sales <[email protected]>
| Newsgroups | org.kernel.vger.git |
|---|---|
| Message-ID | <[email protected]> |
When a rebase stops for conflicts and the user runs `git rebase --continue`, the merge backend opens $EDITOR so the commit message can be revised. That is often useful, but not always: sometimes the user only wants to keep the message that is already there. This series adds: - `git rebase --continue --no-edit` to commit without opening an editor - `rebase.noEdit` to make that the default on continue - `git rebase --continue --edit` to override `rebase.noEdit` The command-line flags apply only to the current `--continue` invocation, not to later picks in the same rebase. Tests are added in t3436. I also ran all tests locally. Hugo Sales (1): rebase: add --[no-]edit to --continue Documentation/config/rebase.adoc | 6 ++++ Documentation/git-rebase.adoc | 17 +++++++++-- builtin/rebase.c | 29 ++++++++++++++++-- sequencer.c | 29 +++++++++++++++++- t/t3436-rebase-more-options.sh | 52 ++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 7 deletions(-) -- 2.54.0