jesseduffield.lazygit/pkg/gui/controllers/helpers
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
..
amend_helper.go Allow passing refresh scope to WithGpgHandling 2025-03-24 08:41:58 +01:00
app_status_helper.go chore: fix function name in comment 2025-12-06 18:28:58 +08:00
bisect_helper.go Change Refresh to not return an error 2025-07-02 16:09:42 +02:00
branches_helper.go Don't auto-forward branches that are checked out by another worktree 2025-08-20 10:43:19 +02:00
cherry_pick_helper.go Avoid scrolling the selection into view on refresh 2025-12-23 15:34:38 +01:00
commits_helper.go Bump gocui (and tcell) 2025-12-23 16:49:16 +01:00
commits_helper_test.go Remove hard line breaks when rewording commits 2024-03-09 10:00:44 +01:00
confirmation_helper.go Add comments 2026-03-08 17:24:26 +01:00
credentials_helper.go chore: fix function name in comment 2025-12-06 18:28:58 +08:00
diff_helper.go Move the Ref interface from gui/types to models 2025-07-31 15:21:34 +02:00
files_helper.go Cleanup: remove unused interfaces for helpers 2025-04-08 16:08:25 +02:00
fixup_helper.go Ignore fixup commits for a found base commit when doing ctrl-f 2026-01-24 16:04:35 +01:00
fixup_helper_test.go Ignore fixup commits for a found base commit when doing ctrl-f 2026-01-24 16:04:35 +01:00
gpg_helper.go Change Refresh to not return an error 2025-07-02 16:09:42 +02:00
helpers.go Implement suspending the app using ctrl-z 2025-08-14 20:41:46 +02:00
host_helper.go Cleanup: remove unused interfaces for helpers 2025-04-08 16:08:25 +02:00
inline_status_helper.go Instantiate other mutexes by value 2025-06-19 18:39:46 +02:00
merge_and_rebase_helper.go Don't stage out-of-date submodules when asking user to auto-stage after resolving conflicts 2026-03-30 17:41:53 +02:00
merge_conflicts_helper.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
mode_helper.go Show context-specific labels for the global <esc> binding 2025-08-14 17:59:38 +02:00
patch_building_helper.go Turn error checks in discard handler into DisabledReasons 2026-03-07 20:47:19 +11:00
record_directory_helper.go split context common from helper common 2023-04-30 13:19:53 +10:00
refresh_helper.go Rename GetFilter to GetStatusFilter on IFileTree 2026-03-07 20:04:31 +01:00
refs_helper.go Avoid scrolling the selection into view on refresh 2025-12-23 15:34:38 +01:00
repos_helper.go Modernize all codes 2025-11-15 10:46:23 +01:00
search_helper.go Only reset selection in ReApplyFilter when search prompt is active 2026-03-07 20:04:31 +01:00
signal_handling.go Implement suspending the app using ctrl-z 2025-08-14 20:41:46 +02:00
signal_handling_windows.go Implement suspending the app using ctrl-z 2025-08-14 20:41:46 +02:00
snake_helper.go Bump gocui and adapt lazygit code 2024-12-01 10:40:08 +01:00
staging_helper.go Add user config to use hunk mode by default when entering staging view 2025-07-04 19:41:40 +02:00
sub_commits_helper.go Scroll to top when showing subcommits 2026-03-27 14:55:02 +01:00
suggestions_helper.go Use git ls-files to list all file suggestions 2025-11-21 07:57:56 +01:00
suspend_resume_helper.go Implement suspending the app using ctrl-z 2025-08-14 20:41:46 +02:00
tags_helper.go Use ConfirmIf where applicable 2025-07-08 16:41:22 +02:00
update_helper.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
upstream_helper.go Cleanup: remove unused interfaces for helpers 2025-04-08 16:08:25 +02:00
upstream_helper_test.go Standardise on using lo for slice functions 2023-07-30 18:51:23 +10:00
view_helper.go standardise helper args 2023-04-30 13:19:53 +10:00
window_arrangement_helper.go Modernize all codes 2025-11-15 10:46:23 +01:00
window_arrangement_helper_test.go Fix window arrangement when a popup or the search prompt is open 2025-10-14 12:22:58 +02:00
window_helper.go Replace CurrentContext() with Context().Current() 2024-08-17 11:14:51 +02:00
working_tree_helper.go Don't stage out-of-date submodules when asking user to auto-stage after resolving conflicts 2026-03-30 17:41:53 +02:00
worktree_helper.go Remove now unnecessary check for empty string 2025-11-15 15:38:24 +01:00