summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorAndy Koppe <andy.koppe@gmail.com>2023-11-14 21:43:38 +0000
committerJunio C Hamano <gitster@pobox.com>2023-11-16 09:18:22 +0900
commit297be59456f2d27710de01ab88c025241ccb4206 (patch)
treed098ffe7221db6b6faa92c145d3df0862bedfa47 /builtin/commit.c
parent75cf39b1178f5e6c2830bf3e81521828bb0171ff (diff)
rebase: support --autosquash without -i
The rebase --autosquash option is quietly ignored when used without --interactive (apart from preventing preemptive fast-forwarding and triggering conflicts with apply backend options). Change that to support --autosquash without --interactive, by dropping its restriction to REBASE_INTERACTIVE_EXCPLICIT mode. When used this way, auto-squashing is done without opening the todo list editor. Drop the -i requirement from the --autosquash description, and amend t3415-rebase-autosquash.sh to test the option and the rebase.autoSquash config variable with and without -i. Signed-off-by: Andy Koppe <andy.koppe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions