utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-11 08:06:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/gui/controllers
History
Stefan Haller 2e1be45957 Better main view display for conflicing files 
For the less common conflict types DD, AU, UA, DU, and UD, we would previously
only show "* Unmerged path" in the main view, which isn't helpful. Also, for
some of these we would split the main view and show this text both in the
unstaged changes and staged changes views, which is a bit embarrassing.

Improve this by offering more explanation about what's going on, and what the
most likely way to resolve the situation is for each case.
2025-04-09 10:27:57 +02:00
..
helpers Cleanup: remove unused interfaces for helpers 2025-04-08 16:08:25 +02:00
attach.go Begin refactoring gui 2023-04-30 13:19:52 +10:00
base_controller.go Remove return value of Focus-related functions 2024-09-06 08:45:48 +02:00
basic_commits_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
bisect_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
branches_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +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 Handle pasting multi-line commit messages 2025-02-10 13:40:25 +01:00
commit_message_controller.go Handle pasting multi-line commit messages 2025-02-10 13:40:25 +01:00
commits_files_controller.go Add "Absolute path" item to the file view's copy menu 2025-03-25 10:00:56 +01:00
common.go lots of changes 2023-04-30 13:19:53 +10:00
confirmation_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
context_lines_controller.go use an unsigned_64 for DiffContextSize and add saturated add/subtract 2024-11-19 08:21:19 +11:00
custom_patch_options_menu_action.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
diffing_menu_action.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
files_controller.go Better main view display for conflicing files 2025-04-09 10:27:57 +02:00
filter_controller.go Introduce filtered list view model 2023-07-03 12:54:13 +10:00
filtering_menu_action.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
git_flow_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
global_controller.go Disable global keybinds while popups are active 2025-02-23 08:44:48 +01: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 Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
list_controller_trait.go Remove ErrorMsg 2024-04-18 10:10:30 +02:00
local_commits_controller.go Fix the bug described in the previous commit 2025-04-08 16:14:31 +02:00
local_commits_controller_test.go Keep the same line selected after squashing fixup commits 2024-03-09 07:55:22 +01:00
menu_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
merge_conflicts_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
options_menu_action.go Disable KeybindingsMenu using a DisabledReason when a panel is open 2025-01-03 10:09:42 +01:00
patch_building_controller.go Adjust line number for working copy when editing a line 2025-01-07 17:46:51 +01:00
patch_explorer_controller.go Support home and end as alternatives to '<' and '>' 2025-03-17 19:58:01 +01:00
quit_actions.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
reflog_commits_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
remote_branches_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
remotes_controller.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
rename_similarity_threshold_controller.go Remove return value of RenderToMainViews and some related functions 2024-09-06 08:45:48 +02:00
screen_mode_actions.go Standardise on 'screen mode' name 2025-01-11 14:25:48 +11:00
scroll_off_margin.go Replace min/max helpers with built-in min/max 2024-04-07 23:24:10 +08:00
scroll_off_margin_test.go Add tests for scroll-off margin of zero 2023-08-21 08:10:28 +02:00
search_controller.go Introduce filtered list view model 2023-07-03 12:54:13 +10:00
search_prompt_controller.go Enforce single-item selection in various actions 2024-01-19 10:50:49 +11:00
shell_command_action.go Add config os.shellFunctionsFile 2025-04-07 14:35:40 +02: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 Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
stash_controller.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
status_controller.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
sub_commits_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
submodules_controller.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
suggestions_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
switch_to_diff_files_controller.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
switch_to_sub_commits_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
sync_controller.go Fix checking out a different branch while pushing a branch for the first time 2025-01-26 10:22:19 +01:00
tags_controller.go Cleanup: get rid of the variadic parameter of ContextMgr.Push 2025-04-08 16:08:25 +02:00
toggle_whitespace_action.go Remove return value of Focus-related functions 2024-09-06 08:45:48 +02:00
undo_controller.go Improve undo action to restore files upon undoing a commit 2025-01-18 00:07:15 +11:00
vertical_scroll_controller.go Change direct access to Common.UserConfig to a getter 2024-08-18 10:24:52 +02:00
workspace_reset_controller.go Bump gocui and adapt lazygit code 2024-12-01 10:40:08 +01:00
worktree_options_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00
worktrees_controller.go Remove unnecessary type arguments 2025-03-03 21:24:49 +01:00