Stefan Haller 6043eb52db Revert "Update resolve conflict using p instead of k" ...

Now that we can use 'k' as a menu item binding (this was fixed in #5131), use it
for the "keep" entry in the merge menu. I don't think this will be a problem for
people's muscle memory, given that this menu is not encountered every day; and
it's simply the better keybinding.

This reverts commit b32b55201e.

2025-12-22 09:49:04 +01:00

..

helpers

Remove confirmation for opening the merge tool

2025-12-07 20:55:25 +01:00

attach.go

Allow clicking in focused main view to go to staging

2025-04-21 18:03:24 +02:00

base_controller.go

Allow clicking in focused main view to go to staging

2025-04-21 18:03:24 +02:00

basic_commits_controller.go

Add FullRefName to all reset menus

2025-06-04 20:43:01 +02:00

bisect_controller.go

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00

branches_controller.go

Add config option gui.skipSwitchWorktreeOnCheckoutWarning

2025-10-14 14:19:54 +02:00

command_log_controller.go

Remove return value of Focus-related functions

2024-09-06 08:45:48 +02:00

commit_description_controller.go

Cleanup: use FocusedView property for mouse bindings

2025-07-11 11:18:28 +02:00

commit_message_controller.go

Cleanup: use FocusedView property for mouse bindings

2025-07-11 11:18:28 +02:00

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

lots of changes

2023-04-30 13:19:53 +10:00

confirmation_controller.go

Refactor: add a separate Prompt view

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

context_lines_controller.go

Move DiffContextSize and RenameSimilarityThreshold to user config

2025-07-09 13:15:03 +02:00

custom_patch_options_menu_action.go

Avoid auto-stashing when only submodules are out of date

2025-10-16 12:00:31 +02:00

diffing_menu_action.go

Remove TrimSpace calls that are no longer needed

2025-11-15 15:38:24 +01:00

files_controller.go

Revert "Update resolve conflict using p instead of k"

2025-12-22 09:49:04 +01:00

filter_controller.go

Introduce filtered list view model

2023-07-03 12:54:13 +10:00

filtering_menu_action.go

Remove TrimSpace calls that are no longer needed

2025-11-15 15:38:24 +01:00

git_flow_controller.go

Remove unnecessary type arguments

2025-03-03 21:24:49 +01:00

global_controller.go

Replace paging config with an array of pagers

2025-10-14 12:17:13 +02:00

jump_to_side_window_controller.go

Cleanup: get rid of the variadic parameter of ContextMgr.Push

2025-04-08 16:08:25 +02:00

list_controller_trait.go

Enable nolintlint linter, and fix warnings

2025-06-30 18:30:11 +02:00

list_controller.go

Fix page navigation scroll behavior to keep cursor at top/bottom

2025-11-09 19:37:38 +01:00

local_commits_controller_test.go

Keep the same line selected after squashing fixup commits

2024-03-09 07:55:22 +01:00

local_commits_controller.go

Modernize all codes

2025-11-15 10:46:23 +01: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

Rename KeepConfirmKeybindings to KeepConflictingKeybindings

2025-12-22 09:37:06 +01: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

Strip the '+' and '-' characters when copying parts of a diff to the clipboard

2025-04-29 11:33:47 +02:00

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

Add a prompt for the sort order menus for branches

2025-07-09 13:16:42 +02:00

remotes_controller_test.go

feat: add fork remote command

2025-11-16 17:26:00 +01:00

remotes_controller.go

feat: add fork remote command

2025-11-16 17:26:00 +01:00

rename_similarity_threshold_controller.go

Move DiffContextSize and RenameSimilarityThreshold to user config

2025-07-09 13:15:03 +02:00

screen_mode_actions.go

Standardise on 'screen mode' name

2025-01-11 14:25:48 +11:00

scroll_off_margin_test.go

Add tests for scroll-off margin of zero

2023-08-21 08:10:28 +02:00

scroll_off_margin.go

Replace min/max helpers with built-in min/max

2024-04-07 23:24:10 +08:00

search_controller.go

Introduce filtered list view model

2023-07-03 12:54:13 +10:00

search_prompt_controller.go

Hard-code "enter" for search prompt

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

shell_command_action.go

Strip leading/trailing whitespace from prompt input

2025-11-15 15:38:24 +01:00

side_window_controller.go

Cleanup: get rid of the variadic parameter of ContextMgr.Push

2025-04-08 16:08:25 +02:00

snake_controller.go

Cleanup: get rid of the variadic parameter of ContextMgr.Push

2025-04-08 16:08:25 +02:00

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

Add AllowEmptyInput flag to PromptOpts

2025-11-15 15:36:43 +01:00

status_controller.go

Show "Log (x of y)" in the title bar when there is more than one branch log command

2025-10-10 12:49:42 +02:00

sub_commits_controller.go

Use async refresh rather than manual OnWorker call

2025-07-02 16:10:04 +02:00

submodules_controller.go

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00

suggestions_controller.go

Add separate keybindings for confirmMenu and confirmSuggestion

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

switch_to_diff_files_controller.go

When entering a commit in path filtering mode, select the filtered path

2025-10-09 09:58:15 +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

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00

tags_controller.go

Switch to branches view when checking out a commit

2025-11-16 21:23:40 +01:00

toggle_whitespace_action.go

Move IgnoreWhitespaceInDiffView to user config

2025-07-09 13:15:03 +02:00

undo_controller.go

Avoid auto-stashing when only submodules are out of date

2025-10-16 12:00:31 +02:00

vertical_scroll_controller.go

Add IGuiCommon.GetViewBufferManagerForView

2025-04-21 18:03:18 +02:00

view_selection_controller.go

Read all lines from task when jumping to bottom

2025-04-21 18:03:19 +02:00

workspace_reset_controller.go

Avoid auto-stashing when only submodules are out of date

2025-10-16 12:00:31 +02:00

worktree_options_controller.go

Remove unnecessary type arguments

2025-03-03 21:24:49 +01:00

worktrees_controller.go

Fix <enter> keybinding for switching to a worktree

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