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
..
accordion.go	Fix typos	2025-01-03 10:50:36 +11:00
disable_switch_tab_with_panel_jump_keys.go	Add config option to disable tab switching with jump keys	2024-11-09 17:19:14 +11:00
empty_menu.go	Enforce single-item selection in various actions	2024-01-19 10:50:49 +11:00
keybinding_suggestions_when_switching_repos.go	Avoid showing <esc> in options map when it doesn't do anything	2025-08-14 17:59:38 +02:00
mode_specific_keybinding_suggestions.go	Add no-ff merge option	2025-10-19 21:24:28 +02:00
open_link_failure.go	Use our new hyperlink support in the information view	2024-08-24 10:36:01 +02:00
range_select.go	Enable hunk staging mode by default	2025-08-01 10:35:16 +02:00
switch_tab_from_menu.go	Use fields rather than methods on worktrees	2023-07-30 18:35:24 +10:00
switch_tab_with_panel_jump_keys.go	Add config option to disable tab switching with jump keys	2024-11-09 17:19:14 +11:00