jesseduffield.lazygit/pkg/gui/controllers
Stefan Haller 9f38d02a4e Don't stage out-of-date submodules when asking user to auto-stage after resolving conflicts
When you rebase a branch and there are conflicts, lazygit asks you to continue
the rebase when it detects that all conflicts have been resolved. However, it is
common to make additional changes beyond just fixing the conflicts (e.g. to fix
build failures), and when doing that while the "Continue the rebase?" prompt is
showing, lazygit detects that too and asks you if you want to stage those newly
modified files too. This is all well and good (and can be disabled for those who
don't like it); however, lazygit would treat out-of-date submodules as unstaged
changes and would offer to stage those as well, and this is pretty bad and
almost never what you want. Fix this by excluding submodules from that second
check.
2026-03-30 17:41:53 +02:00
..
helpers Don't stage out-of-date submodules when asking user to auto-stage after resolving conflicts 2026-03-30 17:41:53 +02:00
attach.go Add GetOnClick to HasKeybindings 2026-03-25 17:08:02 +01:00
base_controller.go Add GetOnClick to HasKeybindings 2026-03-25 17:08:02 +01:00
basic_commits_controller.go Remove the "old cherry-pick key" warning 2026-01-28 10:15:15 +01:00
bisect_controller.go Change Refresh to not return an error 2025-07-02 16:09:42 +02:00
branches_controller.go Extract a method for selecting the first branch (and first commit) 2025-12-23 15:08:08 +01: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 Add support for clicking on arrows in the file list to expand/collapse directories 2026-03-25 17:08:35 +01:00
common.go
confirmation_controller.go Refactor: add a separate Prompt view 2025-09-05 10:42:03 +02:00
context_lines_controller.go Cleanup: use CurrentSide() instead of private currentSidePanel 2026-03-09 19:42:28 +01:00
custom_patch_options_menu_action.go Remove redundant CantPatchWhileRebasingError checks in handlers 2026-03-07 20:47:19 +11:00
diffing_menu_action.go Remove TrimSpace calls that are no longer needed 2025-11-15 15:38:24 +01:00
files_controller.go Improve performance for discarding range selection of many files 2026-03-27 14:34:47 +01:00
filter_controller.go
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.go Add GetOnClick to HasKeybindings 2026-03-25 17:08:02 +01:00
list_controller_trait.go Enable nolintlint linter, and fix warnings 2025-06-30 18:30:11 +02:00
local_commits_controller.go When moving commits up/down and the selection leaves the view, scroll to make it visible again 2026-01-28 20:44:09 +01:00
local_commits_controller_test.go Move isFixupCommit to FixupHelper 2026-01-24 16:04:35 +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 Rename GetOnClick (et al) to GetOnDoubleClick 2026-03-25 14:58:53 +01: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 Prevent patch building panel from briefly appearing when discarding change from commit 2026-03-07 20:47:20 +11:00
patch_explorer_controller.go Change the "toggle hunk selection" binding description to be dynamic 2025-08-01 10:35:16 +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
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.go Rename GetOnClick (et al) to GetOnDoubleClick 2026-03-25 14:58:53 +01:00
remotes_controller_test.go feat: add fork remote command 2025-11-16 17:26:00 +01:00
rename_similarity_threshold_controller.go Cleanup: use CurrentSide() instead of private currentSidePanel 2026-03-09 19:42:28 +01:00
screen_mode_actions.go Re-render main view when changing screen mode 2026-03-09 19:42:28 +01:00
scroll_off_margin.go
scroll_off_margin_test.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 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 Avoid scrolling the selection into view on refresh 2025-12-23 15:34:38 +01:00
status_controller.go Add backward cycling support for all branches log view 2026-03-08 17:06:17 +01:00
sub_commits_controller.go Use async refresh rather than manual OnWorker call 2025-07-02 16:10:04 +02:00
submodules_controller.go Rename GetOnClick (et al) to GetOnDoubleClick 2026-03-25 14:58:53 +01: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 Rename GetOnClick (et al) to GetOnDoubleClick 2026-03-25 14:58:53 +01: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 Rename GetOnClick (et al) to GetOnDoubleClick 2026-03-25 14:58:53 +01: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 Rename GetOnClick (et al) to GetOnDoubleClick 2026-03-25 14:58:53 +01:00