1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-10 11:10:18 +02:00
lazygit/pkg/integration/tests/branch
Stefan Haller 16dceb813b Show menu instead of prompt when there are conflicts in a rebase or merge
This solves the issue that previously you could too easily abort a rebase
accidentally by hitting escape.
2023-06-01 10:51:48 +02:00
..
checkout_by_name.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
create_tag.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
delete.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
detached_head.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
open_with_cli_arg.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
rebase_abort_on_conflict.go Show menu instead of prompt when there are conflicts in a rebase or merge 2023-06-01 10:51:48 +02:00
rebase_and_drop.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
rebase_cancel_on_conflict.go Show menu instead of prompt when there are conflicts in a rebase or merge 2023-06-01 10:51:48 +02:00
rebase_does_not_autosquash.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
rebase.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
reset_upstream.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
reset.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
set_upstream.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
suggestions.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00