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
..
context	Let users to define custom icons and color for files on the config file	2025-03-25 09:48:12 +01:00
controllers	Better main view display for conflicing files	2025-04-09 10:27:57 +02:00
filetree	Fix discarding submodule changes in nested folders	2025-04-07 09:42:19 +02:00
keybindings	Move labelByKey to config package	2025-02-21 13:20:33 +01:00
mergeconflicts	Remove redundant variable dedeclarations	2024-05-19 16:38:21 +10:00
modes	Allow pasting commits more than once	2024-10-13 16:55:54 +02:00
patch_exploring	Add a tabWidth parameter to WrapViewLinesToWidth to match gocui	2025-02-20 09:13:56 +01:00
popup	Remove return value of Alert/Confirm/Prompt	2024-09-06 08:45:48 +02:00
presentation	Fix display of renamed files	2025-04-02 18:15:44 +02:00
services/custom_commands	Add config os.shellFunctionsFile	2025-04-07 14:35:40 +02:00
status	Clean up error handling of WithWaitingStatus and WithWaitingStatusSync	2024-04-18 10:10:30 +02:00
style	Add function to render a hyperlink	2024-08-24 10:36:01 +02:00
types	Cleanup: get rid of the variadic parameter of ContextMgr.Push	2025-04-08 16:08:25 +02:00
background.go	Fix flicker when showing the status of a background fetch	2025-01-30 08:49:58 +01:00
command_log_panel.go	Support home and end as alternatives to '<' and '>'	2025-03-17 19:58:01 +01:00
context.go	Cleanup: get rid of the variadic parameter of ContextMgr.Push	2025-04-08 16:08:25 +02:00
context_config.go	move some methods	2023-04-30 13:19:53 +10:00
controllers.go	fix: Make tag operation use GPG helper to run signing in sub-process	2025-03-24 08:41:58 +01:00
dummies.go	Optimize number of early calls to GetRepoPaths	2024-07-06 12:09:48 -07:00
editors.go	Add emacs-keybinds for word navigation	2023-08-15 12:22:17 +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	Add pageUp/pageDown/top/bottom keybindings to confirmation panel	2025-04-08 16:11:15 +02:00
gui.go	Cleanup: get rid of the variadic parameter of ContextMgr.Push	2025-04-08 16:08:25 +02:00
gui_common.go	Get rid of error return value of PostRefreshUpdate and a few related ones	2024-10-13 16:55:54 +02:00
gui_driver.go	Fix clicking multiple times in an integration test	2024-10-18 10:06:52 +02:00
information_panel.go	Bump gocui and adapt lazygit code	2024-12-01 10:40:08 +01:00
keybindings.go	Add pageUp/pageDown/top/bottom keybindings to focused command log panel	2025-04-08 16:11:15 +02:00
layout.go	Set tab titles after reloading user config	2025-03-06 08:24:03 +01:00
main_panels.go	Fix race with PTYs in integration tests	2025-03-28 11:16:04 +01:00
menu_panel.go	Cleanup: get rid of the variadic parameter of ContextMgr.Push	2025-04-08 16:08:25 +02:00
options_map.go	Fix layout of options view for non-english languages	2025-03-06 08:19:35 +01:00
pty.go	Fix race with PTYs in integration tests	2025-03-28 11:16:04 +01:00
pty_windows.go	Format code to pass lint	2021-09-16 21:38:43 +08:00
recent_repos_panel.go	Remove unused field gui.IsNewRepo	2024-12-01 10:44:26 +01:00
tasks_adapter.go	Change NewRenderStringWith{out}ScrollTask to reuse the task key of the existing task	2024-10-18 22:46:47 +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	Cleanup: get rid of the variadic parameter of ContextMgr.Push	2025-04-08 16:08:25 +02:00
views.go	Enable AutoRenderHyperLinks for the tooltip view	2025-04-08 16:05:34 +02:00