Krystof Gartner 703f053a7e Add merge options menu ...

Replace merge-tool with merge options menu that allows resolving all
conflicts for selected files as ours, theirs, or union, while still
providing access to the merge tool.

2025-10-09 08:45:58 +02:00

..

amend_helper.go

Allow passing refresh scope to WithGpgHandling

2025-03-24 08:41:58 +01:00

app_status_helper.go

Extract the inner part of WithWaitingStatus as a synchronous variant of it

2025-01-30 08:49:58 +01:00

bisect_helper.go

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00

branches_helper.go

Don't auto-forward branches that are checked out by another worktree

2025-08-20 10:43:19 +02:00

cherry_pick_helper.go

Adjust selection after cherry-picking commits

2025-07-03 17:04:10 +02:00

commits_helper_test.go

Remove hard line breaks when rewording commits

2024-03-09 10:00:44 +01:00

commits_helper.go

Use ConfirmIf where applicable

2025-07-08 16:41:22 +02:00

confirmation_helper.go

Refactor: add a separate Prompt view

2025-09-05 10:42:03 +02:00

credentials_helper.go

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00

diff_helper.go

Move the Ref interface from gui/types to models

2025-07-31 15:21:34 +02:00

files_helper.go

Cleanup: remove unused interfaces for helpers

2025-04-08 16:08:25 +02:00

fixup_helper_test.go

Also return hunks with only added lines from parseDiff

2024-06-01 08:31:18 +02:00

fixup_helper.go

Stage only tracked files when staging all in filter-by-tracked-files view

2025-07-28 14:10:38 +02:00

gpg_helper.go

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00

helpers.go

Implement suspending the app using ctrl-z

2025-08-14 20:41:46 +02:00

host_helper.go

Cleanup: remove unused interfaces for helpers

2025-04-08 16:08:25 +02:00

inline_status_helper.go

Instantiate other mutexes by value

2025-06-19 18:39:46 +02:00

merge_and_rebase_helper.go

Stage only tracked files when staging all in filter-by-tracked-files view

2025-07-28 14:10:38 +02:00

merge_conflicts_helper.go

Cleanup: get rid of the variadic parameter of ContextMgr.Push

2025-04-08 16:08:25 +02:00

mode_helper.go

Show context-specific labels for the global <esc> binding

2025-08-14 17:59:38 +02:00

patch_building_helper.go

Show hint about hunk staging mode being the default now, and how to switch to line mode

2025-08-01 10:35:17 +02:00

record_directory_helper.go

split context common from helper common

2023-04-30 13:19:53 +10:00

refresh_helper.go

Change GetCommitsOptions.RefForPushedStatus to a models.Ref

2025-07-31 15:26:19 +02:00

refs_helper.go

Give better feedback when checking out the previous branch

2025-10-02 18:28:17 +02:00

repos_helper.go

Remove ErrorMsg

2024-04-18 10:10:30 +02:00

search_helper.go

Allow filterable contexts to customize the filter label

2025-08-14 15:02:48 +02:00

signal_handling_windows.go

Implement suspending the app using ctrl-z

2025-08-14 20:41:46 +02:00

signal_handling.go

Implement suspending the app using ctrl-z

2025-08-14 20:41:46 +02:00

snake_helper.go

Bump gocui and adapt lazygit code

2024-12-01 10:40:08 +01:00

staging_helper.go

Add user config to use hunk mode by default when entering staging view

2025-07-04 19:41:40 +02:00

sub_commits_helper.go

Change GetCommitsOptions.RefForPushedStatus to a models.Ref

2025-07-31 15:26:19 +02:00

suggestions_helper.go

Exclude "." from file path suggestions

2025-07-11 11:18:28 +02:00

suspend_resume_helper.go

Implement suspending the app using ctrl-z

2025-08-14 20:41:46 +02:00

tags_helper.go

Use ConfirmIf where applicable

2025-07-08 16:41:22 +02:00

update_helper.go

Remove return value of Alert/Confirm/Prompt

2024-09-06 08:45:48 +02:00

upstream_helper_test.go

Standardise on using lo for slice functions

2023-07-30 18:51:23 +10:00

upstream_helper.go

Cleanup: remove unused interfaces for helpers

2025-04-08 16:08:25 +02:00

view_helper.go

standardise helper args

2023-04-30 13:19:53 +10:00

window_arrangement_helper_test.go

Update to go 1.24

2025-03-08 14:53:54 -05:00

window_arrangement_helper.go

Allow filterable contexts to customize the filter label

2025-08-14 15:02:48 +02:00

window_helper.go

Replace CurrentContext() with Context().Current()

2024-08-17 11:14:51 +02:00

working_tree_helper.go

Add merge options menu

2025-10-09 08:45:58 +02:00

worktree_helper.go

Change Refresh to not return an error

2025-07-02 16:09:42 +02:00