go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-12 11:15:00 +02:00
Code Issues Releases Activity
3928d0ebda
lazygit/pkg/integration/tests
History
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
..
bisect Use sentence case everywhere 2023-05-25 23:52:19 +10:00
branch Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
cherry_pick Use sentence case everywhere 2023-05-25 23:52:19 +10:00
commit Better prompt for discarding old file changes 2023-06-07 12:47:03 +02:00
config Support matchers on integers in integration tests 2023-06-03 15:32:23 +10:00
conflicts Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
custom_commands Support suggestions generated from command in custom commands 2023-05-29 22:47:35 +10:00
diff Use sentence case everywhere 2023-05-25 23:52:19 +10:00
file Use sentence case everywhere 2023-05-25 23:52:19 +10:00
filter_by_path Use sentence case everywhere 2023-05-25 23:52:19 +10:00
interactive_rebase Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
misc Fix focus issue when opening recent-repos menu at launch 2023-06-07 18:27:18 +10:00
patch_building Use sentence case everywhere 2023-05-25 23:52:19 +10:00
reflog Fix flakey test 2023-06-03 15:54:03 +10:00
shared Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
staging Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
stash Allow discarding changes only from local commits 2023-06-07 12:48:56 +02:00
submodule Use sentence case everywhere 2023-05-25 23:52:19 +10:00
sync Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
tag Use sentence case everywhere 2023-05-25 23:52:19 +10:00
ui Use sentence case everywhere 2023-05-25 23:52:19 +10:00
undo Use sentence case everywhere 2023-05-25 23:52:19 +10:00
test_list_generator.go cleanup integration test code 2023-02-26 12:54:13 +11:00
test_list.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
tests.go cleanup integration test code 2023-02-26 12:54:13 +11:00