1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00
lazygit/pkg/commands
Stefan Haller 3928d0ebda Insert fake todo entry for a conflicting commit that is being applied
When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.
2023-06-22 18:57:58 +02:00
..
git_commands Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
git_config remove deprecated calls 2022-09-17 15:10:41 -07:00
hosting_service Update gitlab commit URL to match new routing 2023-05-22 07:39:47 +03:30
models Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
oscommands Appease linter 2023-06-03 15:54:03 +10:00
patch Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00
testdata
types/enums
git_cmd_obj_builder.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
git_cmd_obj_runner.go fix(loaders/file.go): changed to ignore stderr when loading git status 2022-09-19 18:46:32 +09:00
git_test.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
git.go show commits against branches 2023-06-01 19:21:24 +10:00