1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-30 09:16:47 +02:00
lazygit/pkg/gui/presentation
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
..
authors Right-align key labels in menu 2023-05-21 12:09:43 +10:00
graph Apply correct styling to root commit in graph 2023-06-01 22:20:30 +10:00
icons Add nerdFontsVersion config 2023-06-15 21:47:52 +02:00
branches.go show commits against branches 2023-06-01 19:21:24 +10:00
commits_test.go More compact and flexible date format 2023-05-26 17:31:39 +10:00
commits.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
files_test.go Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00
files.go rename patch manager to patch builder 2023-03-19 16:35:57 +11:00
menu.go refactor contexts 2022-03-17 19:13:40 +11:00
reflog_commits.go More compact and flexible date format 2023-05-26 17:31:39 +10:00
remote_branches.go feat(gui): show branch icons 2022-04-23 12:25:41 +09:00
remotes.go feat(gui): show remote icons 2022-04-23 12:25:42 +09:00
stash_entries.go feat: add stash icon 2022-10-14 21:58:58 +09:00
submodules.go many more generics 2022-03-24 20:14:41 +11:00
suggestions.go many more generics 2022-03-24 20:14:41 +11:00
tags.go show tag message 2023-02-20 19:01:08 +11:00
working_tree.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00