Files
git/Documentation
Andy Koppe 297be59456 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>
2023-11-16 09:18:22 +09:00
..
2023-10-30 07:09:55 +09:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-10-09 12:06:29 -07:00
2023-09-02 15:21:44 -07:00
2023-10-09 12:06:29 -07:00
2023-06-12 13:52:51 -07:00
2023-06-12 13:52:51 -07:00
2023-10-23 13:56:37 -07:00
2021-12-10 14:35:03 -08:00
2023-05-16 11:38:14 -07:00
2023-10-09 12:06:24 -07:00
2023-10-09 12:06:29 -07:00
2023-10-05 12:55:38 -07:00
2023-10-09 12:06:29 -07:00
2023-10-09 12:06:29 -07:00
2023-08-28 09:16:06 -07:00
2023-10-09 12:04:21 -07:00