]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: add --[no-]edit to --continue
authorHugo Sales <hugo@hsal.es>
Tue, 21 Jul 2026 14:04:42 +0000 (15:04 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jul 2026 16:42:41 +0000 (09:42 -0700)
commit179eccf0d01729c19a3238905b951b1880aa4ba1
treeb5b44b72acf81981f61526d5947eb29b490cd079
parente9019fcafe0040228b8631c30f97ae1adb61bcdc
rebase: add --[no-]edit to --continue

Allow skipping the editor when continuing after resolving conflicts,
via --no-edit or the rebase.noEdit configuration variable. The --edit
option overrides rebase.noEdit when both are set.

Signed-off-by: Hugo Sales <hugo@hsal.es>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config/rebase.adoc
Documentation/git-rebase.adoc
builtin/rebase.c
sequencer.c
t/t3436-rebase-more-options.sh