utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 15:46:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/gui/controllers
History
Stefan Haller 078445db63 Allow deleting a merge commit 
For non-merge commits we change "pick" to "drop" when we delete them. We do this
so that we can use the same code for dropping a commit no matter whether we are
in an interactive rebase or not. (If we aren't, we could just as well delete the
pick line from the todo list instead of setting it to "drop", but if we are, it
is better to keep the line around so that the user can change it back to "pick"
if they change their mind.)

However, merge commits can't be changed to "drop", so we have to delete them
from the todo file. We add a new daemon instruction that does this.

We still don't allow deleting a merge commit from within an interactive rebase.
The reason is that we don't show the "label" and "reset" todos in lazygit, so
deleting a merge commit would leave the commits from the branch that is being
merged in the list as "pick" commits, with no indication that they are going to
be dropped because they are on a different branch, and the merge commit that
would have brought them in is gone. This could be very confusing.
2024-12-23 12:12:45 +01:00
..
helpers Cleanup: move adding --ignore-all-space arg to DiffCmdObj 2024-12-01 13:01:15 +01: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 return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
bisect_controller.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
branches_controller.go Allow deleting a range selection of branches 2024-12-01 10:59:54 +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 Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
commit_message_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
commits_files_controller.go Get rid of error return value of PostRefreshUpdate and a few related ones 2024-10-13 16:55:54 +02: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 Remove return value of OpenCommitMessagePanel 2024-09-06 08:45:48 +02:00
diffing_menu_action.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
files_controller.go Add new filter to only show tracked files in Files panel 2024-11-12 16:54:24 +11:00
filter_controller.go Introduce filtered list view model 2023-07-03 12:54:13 +10:00
filtering_menu_action.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
git_flow_controller.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
global_controller.go Rename "Custom Command" to "Shell Command" 2024-08-17 10:56:03 +02:00
jump_to_side_window_controller.go Add config option to disable tab switching with jump keys 2024-11-09 17:19:14 +11:00
list_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
list_controller_trait.go Remove ErrorMsg 2024-04-18 10:10:30 +02:00
local_commits_controller.go Allow deleting a merge commit 2024-12-23 12:12:45 +01: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 return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02: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 Replace CurrentContext() with Context().Current() 2024-08-17 11:14:51 +02:00
patch_building_controller.go Get rid of error return value of PostRefreshUpdate and a few related ones 2024-10-13 16:55:54 +02:00
patch_explorer_controller.go Cleanup: remove isFocused parameter from GetContentToRender and related methods 2024-10-18 22:46:48 +02:00
quit_actions.go Get rid of error return value of PostRefreshUpdate and a few related ones 2024-10-13 16:55:54 +02:00
reflog_commits_controller.go Remove return value of RenderToMainViews and some related functions 2024-09-06 08:45:48 +02:00
remote_branches_controller.go Allow deleting a range selection of branches 2024-12-01 10:59:54 +01:00
remotes_controller.go Get rid of error return value of PostRefreshUpdate and a few related ones 2024-10-13 16:55:54 +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 Remove return value of HandleRender 2024-09-06 08:45:48 +02: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 Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
side_window_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
snake_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
staging_controller.go Don't render staging view when it loses focus 2024-10-18 22:46:47 +02:00
stash_controller.go Add options for disabling switching to the Files panel after popping or applying a stash 2024-09-15 11:59:59 +02:00
status_controller.go Use AutoRenderHyperLinks in main views 2024-09-28 12:04:51 +02:00
sub_commits_controller.go Remove return value of Focus-related functions 2024-09-06 08:45:48 +02:00
submodules_controller.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
suggestions_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
switch_to_diff_files_controller.go Remove return value of IContextMgr.Push/Pop et. al. 2024-09-06 08:45:48 +02:00
switch_to_sub_commits_controller.go Set groundwork for better disabled reasons with range select 2024-01-23 13:03:37 +11:00
sync_controller.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
tags_controller.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02:00
toggle_whitespace_action.go Remove return value of Focus-related functions 2024-09-06 08:45:48 +02:00
undo_controller.go Remove return value of Alert/Confirm/Prompt 2024-09-06 08:45:48 +02: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 Set groundwork for better disabled reasons with range select 2024-01-23 13:03:37 +11:00
worktrees_controller.go Remove return value of RenderToMainViews and some related functions 2024-09-06 08:45:48 +02:00