mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
lazygit/pkg/commands
History
Stefan Haller ff465e2581 Show original todo action instead of "conflict", and show <-- CONFLICT instead 
It is useful to see if the conflicted commit was a "pick" or an "edit". What's
more, we're about to add support for showing cherry-picks and reverts, and
seeing that a conflicted commit was a revert is important because its diff is
backwards compared to the diff of the conflicting files in the Files panel.
2025-04-20 15:55:44 +02:00
..
git_commands Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
git_config Drop the git config cache when getting focus 2025-03-20 11:50:28 +01:00
hosting_service URL encode gitlab brackets to make consistent with branch names 2025-03-12 09:04:04 +11:00
models Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
oscommands Add config os.shellFunctionsFile 2025-04-07 14:35:40 +02:00
patch Adjust line number for working copy when editing a line 2025-01-07 17:46:51 +01:00
testdata Support opening lazygit in a submodule 2019-05-12 17:59:49 +10:00
git.go Use WorkingTreeState instead of RebaseMode in CommitLoader 2025-04-20 15:53:17 +02:00
git_cmd_obj_builder.go Add config os.shellFunctionsFile 2025-04-07 14:35:40 +02:00
git_cmd_obj_runner.go Retry on index.lock error 2023-07-10 19:13:18 +10:00