Stefan Haller acc15a6e43 Prompt for base branch when move-commits-to-new-branch is ambiguous ...

The "off of <base>" item in the move-commits-to-new-branch menu now
shows the disambiguation picker first when the base is ambiguous,
then continues into the existing new-branch-name prompt with the
chosen base. The "stacked on current branch" path doesn't use the
base, so it's unaffected.

2026-07-03 19:37:37 +02:00

..

helpers

Prompt for base branch when move-commits-to-new-branch is ambiguous

2026-07-03 19:37:37 +02:00

attach.go

…

base_controller.go

Copy gocui files into lazygit repo under pkg/gocui

2026-04-30 14:29:08 +02:00

basic_commits_controller.go

Move the new-worktree keybinding from worktrees to universal

2026-07-03 18:53:05 +02:00

bisect_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

branches_controller.go

Prompt for base branch when viewing divergence is ambiguous

2026-07-03 19:37:37 +02:00

command_log_controller.go

…

commit_description_controller.go

Fold remaining alt bindings into their main fields

2026-05-25 15:32:47 +02:00

commit_message_controller.go

Convert keybinding fields to Keybinding

2026-05-25 15:32:47 +02:00

commits_files_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

common.go

…

confirmation_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

context_lines_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

custom_patch_options_menu_action.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

diffing_menu_action.go

…

edit_config_action.go

Extract editConfig into a shared EditConfigAction

2026-06-24 22:03:57 +02:00

files_controller.go

Extract per-case render helpers from FilesController.GetOnRenderToMain

2026-06-28 16:24:02 +02:00

filter_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

filtering_menu_action.go

…

git_flow_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

global_controller.go

Add a global keybinding for editing the config file

2026-06-24 22:10:52 +02:00

jump_to_side_window_controller.go

Stop requiring jumpToBlock to have exactly five entries

2026-06-23 14:15:18 +02:00

list_controller_trait.go

…

list_controller.go

Fold remaining alt bindings into their main fields

2026-05-25 15:32:47 +02:00

local_commits_controller_test.go

…

local_commits_controller.go

Remove bespoke commit selection restoration when starting a rebase

2026-06-23 09:20:05 +02:00

main_view_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

menu_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

menu_key.go

Use a slice of keys for each binding

2026-05-25 15:18:18 +02:00

merge_conflicts_controller.go

Pick both hunks, not the common ancestor, in diff3 conflicts

2026-07-01 09:57:26 +02:00

options_menu_action.go

If a menu entry has multiple keybindings, list them in a tooltip

2026-05-25 15:32:47 +02:00

patch_building_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

patch_explorer_controller_test.go

…

patch_explorer_controller.go

Fold remaining alt bindings into their main fields

2026-05-25 15:32:47 +02:00

prompt_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

quit_actions.go

Copy gocui files into lazygit repo under pkg/gocui

2026-04-30 14:29:08 +02:00

reflog_commits_controller.go

…

remote_branches_controller.go

Move the new-worktree keybinding from worktrees to universal

2026-07-03 18:53:05 +02:00

remotes_controller_test.go

…

remotes_controller.go

Make the remote-branches view follow its parent's window

2026-06-23 14:15:18 +02:00

rename_similarity_threshold_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

screen_mode_actions.go

Copy gocui files into lazygit repo under pkg/gocui

2026-04-30 14:29:08 +02:00

scroll_off_margin_test.go

…

scroll_off_margin.go

…

search_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

search_prompt_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

shell_command_action.go

…

side_window_controller.go

Fold remaining alt bindings into their main fields

2026-05-25 15:32:47 +02:00

snake_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

staging_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

stash_controller.go

Move the new-worktree keybinding from worktrees to universal

2026-07-03 18:53:05 +02:00

status_controller.go

Extract editConfig into a shared EditConfigAction

2026-06-24 22:03:57 +02:00

sub_commits_controller.go

…

submodules_controller.go

Convert keybinding fields to Keybinding

2026-05-25 15:32:47 +02:00

suggestions_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

switch_to_diff_files_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

switch_to_focused_main_view_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

switch_to_sub_commits_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

sync_controller.go

Keep selected commits stable across refreshes

2026-06-23 09:20:05 +02:00

tags_controller.go

Move the new-worktree keybinding from worktrees to universal

2026-07-03 18:53:05 +02:00

toggle_whitespace_action.go

…

undo_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

vertical_scroll_controller.go

Copy gocui files into lazygit repo under pkg/gocui

2026-04-30 14:29:08 +02:00

view_selection_controller.go

Fold remaining alt bindings into their main fields

2026-05-25 15:32:47 +02:00

workspace_reset_controller.go

Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem

2026-05-25 15:18:18 +02:00

worktrees_controller.go

Offer to delete the branch when removing a worktree

2026-07-03 19:04:44 +02:00