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
..
fetch_prune.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
force_push_multiple_matching.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
force_push_multiple_upstream.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
force_push.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
pull_and_set_upstream.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
pull_merge_conflict.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
pull_merge.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
pull_rebase_conflict.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
pull_rebase_interactive_conflict_drop.go	Insert fake todo entry for a conflicting commit that is being applied	2023-06-22 18:57:58 +02:00
pull_rebase_interactive_conflict.go	Insert fake todo entry for a conflicting commit that is being applied	2023-06-22 18:57:58 +02:00
pull_rebase.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
pull.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
push_and_auto_set_upstream.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
push_and_set_upstream.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
push_follow_tags.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
push_no_follow_tags.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
push_tag.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
push_with_credential_prompt.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
push.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00
rename_branch_and_pull.go	Use sentence case everywhere	2023-05-25 23:52:19 +10:00
shared.go	cleanup integration test code	2023-02-26 12:54:13 +11:00