jesseduffield.lazygit/pkg
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
..
app Fix focus issue when opening recent-repos menu at launch 2023-06-07 18:27:18 +10:00
cheatsheet Use sentence case everywhere 2023-05-25 23:52:19 +10:00
commands Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
common introduce Common struct for passing around common stuff 2022-01-04 09:07:15 +11:00
config Add nerdFontsVersion config 2023-06-15 21:47:52 +02:00
constants update release notes 2021-04-20 18:34:47 +10:00
env clearer separation of concerns when bootstrapping application 2022-05-07 16:02:04 +10:00
fakes cleanup integration test code 2023-02-26 12:54:13 +11:00
gui Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
i18n Allow discarding changes only from local commits 2023-06-07 12:48:56 +02:00
integration Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
logs Allow global logging when developing 2023-05-25 18:31:32 +10:00
secureexec Cache binary paths 2023-05-23 19:15:33 +10:00
snake integrate snake game into lazygit 2022-12-30 12:18:59 +11:00
tasks prevent unnecessary re-renders of view 2023-04-02 15:44:05 +10:00
theme Set defaults colours to 'default', not 'white' 2023-06-01 18:59:04 +10:00
updates Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
utils show commits against branches 2023-06-01 19:21:24 +10:00