go/lazygit

mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-23 22:24:51 +02:00

Files

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

dev

Fix typos

2025-01-03 10:50:36 +11:00

keybindings

Add merge options menu

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

Config.md

Add merge options menu

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

Custom_Command_Keybindings.md

Combine customCommand's subprocess, stream, and showOutput fields into a single output enum

2025-05-01 15:46:06 +02:00

Custom_Pagers.md

Add a user config for using git's external diff command for paging

2025-08-20 10:39:55 +02:00

Fixup_Commits.md

Update user doc

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

Range_Select.md

Add range selection ability on list contexts

2024-01-19 10:47:21 +11:00

README.md

Normalize line endings of docs/README.md

2024-07-01 08:36:57 +02:00

Searching.md

Add filtering docs

2023-07-03 12:54:14 +10:00

Stacked_Branches.md

chore: fix some comments and typos

2024-04-28 09:44:59 +02:00

Undoing.md

Add undo demo

2023-08-12 16:15:50 +10:00

README.md

Documentation Overview