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
..
checkout_by_name.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
create_tag.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
delete.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
detached_head.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
open_with_cli_arg.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
rebase_abort_on_conflict.go	Show menu instead of prompt when there are conflicts in a rebase or merge	2023-06-01 10:51:48 +02:00
rebase_and_drop.go	Insert fake todo entry for a conflicting commit that is being applied	2023-06-22 18:57:58 +02:00
rebase_cancel_on_conflict.go	Show menu instead of prompt when there are conflicts in a rebase or merge	2023-06-01 10:51:48 +02:00
rebase_does_not_autosquash.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
rebase.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
reset_upstream.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
reset.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
set_upstream.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
suggestions.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00