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
..
branch.go	show commits against branches	2023-06-01 19:21:24 +10:00
commit.go	Insert fake todo entry for a conflicting commit that is being applied	2023-06-22 18:57:58 +02:00
commit_file.go	Better prompt for discarding old file changes	2023-06-07 12:47:03 +02:00
file.go	fix could-not-access error	2022-11-11 12:30:14 +11:00
remote.go	move models folder into commands folder	2020-09-29 20:48:49 +10:00
remote_branch.go	fix: fix ambiguous refname	2022-05-13 21:05:51 +09:00
stash_entry.go	fix: fix ambiguous refname	2022-05-13 21:05:51 +09:00
submodule_config.go	add submodules context	2020-10-02 08:09:42 +10:00
tag.go	show tag message	2023-02-20 19:01:08 +11:00