Krystof Gartner 703f053a7e Add merge options menu ...

Replace merge-tool with merge options menu that allows resolving all
conflicts for selected files as ours, theirs, or union, while still
providing access to the merge tool.

2025-10-09 08:45:58 +02:00

..

helpers

Add merge options menu

2025-10-09 08:45:58 +02:00

attach.go

…

base_controller.go

…

basic_commits_controller.go

…

bisect_controller.go

…

branches_controller.go

Give better feedback when checking out the previous branch

2025-10-02 18:28:17 +02:00

command_log_controller.go

…

commit_description_controller.go

…

commit_message_controller.go

…

commits_files_controller.go

Show hint about hunk staging mode being the default now, and how to switch to line mode

2025-08-01 10:35:17 +02:00

common.go

…

confirmation_controller.go

Refactor: add a separate Prompt view

2025-09-05 10:42:03 +02:00

context_lines_controller.go

…

custom_patch_options_menu_action.go

…

diffing_menu_action.go

…

files_controller.go

Add merge options menu

2025-10-09 08:45:58 +02:00

filter_controller.go

…

filtering_menu_action.go

Refresh all affected scopes when entering/exiting filtering

2025-07-27 12:03:06 +02:00

git_flow_controller.go

…

global_controller.go

Implement suspending the app using ctrl-z

2025-08-14 20:41:46 +02:00

jump_to_side_window_controller.go

…

list_controller_trait.go

…

list_controller.go

…

local_commits_controller_test.go

…

local_commits_controller.go

Allow rewording and dropping commits in filtering mode

2025-07-27 12:48:38 +02:00

main_view_controller.go

Show "Exit back to side panel" in options status bar for focused main view

2025-08-14 17:59:38 +02:00

menu_controller.go

Add separate keybindings for confirmMenu and confirmSuggestion

2025-09-05 10:42:04 +02:00

merge_conflicts_controller.go

Add merge options menu

2025-10-09 08:45:58 +02:00

options_menu_action.go

Don't hide keybindings that match the confirmMenu key in the keybindings menu

2025-09-07 12:43:54 +02:00

patch_building_controller.go

Show context-specific labels for <esc> in staging and patch building view

2025-08-14 17:59:38 +02:00

patch_explorer_controller_test.go

…

patch_explorer_controller.go

Change the "toggle hunk selection" binding description to be dynamic

2025-08-01 10:35:16 +02:00

prompt_controller.go

Hard-code "enter" for editable prompts

2025-09-05 10:42:04 +02:00

quit_actions.go

Show context-specific labels for the global <esc> binding

2025-08-14 17:59:38 +02:00

reflog_commits_controller.go

Fix showing diffs for renamed file when filtering by path

2025-07-27 12:05:41 +02:00

remote_branches_controller.go

…

remotes_controller.go

…

rename_similarity_threshold_controller.go

…

screen_mode_actions.go

…

scroll_off_margin_test.go

…

scroll_off_margin.go

…

search_controller.go

…

search_prompt_controller.go

Hard-code "enter" for search prompt

2025-09-05 10:42:04 +02:00

shell_command_action.go

…

side_window_controller.go

…

snake_controller.go

…

staging_controller.go

Show context-specific labels for <esc> in staging and patch building view

2025-08-14 17:59:38 +02:00

stash_controller.go

Log hashes when dropping/popping stashes

2025-08-25 19:23:30 +02:00

status_controller.go

…

sub_commits_controller.go

…

submodules_controller.go

…

suggestions_controller.go

Add separate keybindings for confirmMenu and confirmSuggestion

2025-09-05 10:42:04 +02:00

switch_to_diff_files_controller.go

Move the Ref interface from gui/types to models

2025-07-31 15:21:34 +02:00

switch_to_focused_main_view_controller.go

Move the "Focus main view" command to the global section of the keybindings menu

2025-07-27 12:25:16 +02:00

switch_to_sub_commits_controller.go

Move the Ref interface from gui/types to models

2025-07-31 15:21:34 +02:00

sync_controller.go

…

tags_controller.go

Use a different way to check if a tag is annotated

2025-07-28 10:53:51 +02:00

toggle_whitespace_action.go

…

undo_controller.go

Use the non-filtered reflog for undoing

2025-07-27 12:05:41 +02:00

vertical_scroll_controller.go

…

view_selection_controller.go

…

workspace_reset_controller.go

Add confirmation for nuking the working tree

2025-07-13 14:04:14 +02:00

worktree_options_controller.go

…

worktrees_controller.go

Fix <enter> keybinding for switching to a worktree

2025-09-05 10:42:04 +02:00