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

..

git_commands

Add merge options menu

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

git_config

Enable errorlint linter, and fix warnings

2025-06-30 18:30:11 +02:00

hosting_service

fix(hosting_service): support Azure DevOps vs-ssh.visualstudio.com SSH remotes

2025-08-14 15:20:56 +02:00

models

Add hash field to models.StashEntry

2025-08-25 19:23:30 +02:00

oscommands

Clean up build tags

2025-08-14 20:40:44 +02:00

patch

Don't use hunk mode for added or deleted files

2025-07-27 12:10:25 +02:00

testdata

Support opening lazygit in a submodule

2019-05-12 17:59:49 +10:00

git_cmd_obj_builder.go

Remove ICmdObj interface

2025-05-01 15:21:37 +02:00

git_cmd_obj_runner.go

Enable intrange linter, and fix warnings

2025-06-30 18:30:11 +02:00

git.go

Use WorkingTreeState instead of RebaseMode in CommitLoader

2025-04-20 15:53:17 +02:00