Stefan Haller 62854026a3 Add no-ff merge option ... This will put whatever git's default merge variant is as the first menu item, and add a second item which is the opposite (no-ff if the default is ff, and vice versa). If users prefer to always have the same option first no matter whether it's applicable, they can make ff always appear first by setting git's "merge.ff" config to "true" or "only", or by setting lazygit's "git.merging.args" config to "--ff" or "--ff-only"; if they want no-ff to appear first, they can do that by setting git's "merge.ff" config to "false", or by setting lazygit's "git.merging.args" config to "--no-ff". Which of these they choose depends on whether they want the config to also apply to other git clients including the cli, or only to lazygit.		2025-10-19 21:24:28 +02:00
..
context	Refactor: add a separate Prompt view	2025-09-05 10:42:03 +02:00
controllers	Add no-ff merge option	2025-10-19 21:24:28 +02:00
filetree	When entering a commit in path filtering mode, select the filtered path	2025-10-09 09:58:15 +02:00
keybindings	Make LabelFromKey return an empty string for unset keys	2025-07-27 12:25:16 +02:00
mergeconflicts	Enable revive linter, and fix a bunch of warnings	2025-06-30 19:13:20 +02:00
modes	Make Commit.Hash a getter for an unexported hash field	2025-04-29 14:57:15 +02:00
patch_exploring	Don't use hunk mode for added or deleted files	2025-07-27 12:10:25 +02:00
popup	Add convenience function ConfirmIf	2025-07-08 16:41:22 +02:00
presentation	Fix right-alignment of divergence from base branch for branch checked out in a worktree	2025-08-14 14:28:11 +02:00
services/custom_commands	Change Refresh to not return an error	2025-07-02 16:09:42 +02:00
status	Move Loader to presentation package	2025-05-06 09:52:53 +02:00
style	Add function to render a hyperlink	2024-08-24 10:36:01 +02:00
types	Add PagerConfig	2025-10-14 12:17:13 +02:00
background.go	Change Refresh to not return an error	2025-07-02 16:09:42 +02:00
command_log_panel.go	Add merge options menu	2025-10-09 08:45:58 +02:00
context.go	Hide the cursor when the password prompt is showing	2025-09-20 11:11:46 +02:00
context_config.go	Remove some unused code	2025-07-08 15:14:45 +02:00
controllers.go	Add merge options menu	2025-10-09 08:45:58 +02:00
dummies.go	Move NewDummyCommon to pkg/common	2025-05-06 09:43:26 +02:00
editors.go	Support Alt+Backspace for word deletion in text areas	2025-07-17 19:13:25 +02:00
extras_panel.go	Add pageUp/pageDown/top/bottom keybindings to focused command log panel	2025-04-08 16:11:15 +02:00
global_handlers.go	Refactor: add a separate Prompt view	2025-09-05 10:42:03 +02:00
gui.go	Add PagerConfig	2025-10-14 12:17:13 +02:00
gui_common.go	Implement suspending the app using ctrl-z	2025-08-14 20:41:46 +02:00
gui_driver.go	Fix clicking multiple times in an integration test	2024-10-18 10:06:52 +02:00
information_panel.go	Rename ModeStatus.Description to InfoLabel	2025-08-14 17:59:38 +02:00
keybindings.go	Refactor: add a separate Prompt view	2025-09-05 10:42:03 +02:00
layout.go	Bump gocui and adapt lazygit code	2025-06-05 13:20:38 +02:00
main_panels.go	Fix race with PTYs in integration tests	2025-03-28 11:16:04 +01:00
menu_panel.go	Don't hide keybindings that match the confirmMenu key in the keybindings menu	2025-09-07 12:43:54 +02:00
options_map.go	Avoid duplicate key bindings in options map	2025-08-14 17:59:38 +02:00
pty.go	Add PagerConfig	2025-10-14 12:17:13 +02:00
pty_windows.go	Export a LAZYGIT_COLUMNS variable to "pty" tasks on Windows	2025-10-09 10:04:29 +02:00
recent_repos_panel.go	Remove unused field gui.IsNewRepo	2024-12-01 10:44:26 +01:00
tasks_adapter.go	Close a task's stdout pipe when we are done with it	2025-08-01 10:32:46 +02:00
test_mode.go	Don't wait in integration tests when running in headless mode	2024-06-05 14:44:02 +02:00
view_helpers.go	Refresh the main view for the current side panel when a popup is showing	2025-10-09 09:02:03 +02:00
views.go	Refactor: add a separate Prompt view	2025-09-05 10:42:03 +02:00