Jesse Duffield 5e95019b3f Missed a spot with this new string task thing ... The issue here was that we were using a string task but expecting to be able to set the origin straight after to point at the conflict, but because it's async it was actually resetting the origin to 0 after a little bit. The proper solution here is maybe to add a flag to that thing asking whether you want to reset main's origin. But I'm too lazy to do that right now so instead I'm just using setViewContent. That will probably cause issues in the future.		2020-01-12 14:43:17 +11:00
..
app_status_manager.go	show loading status for rebasing events	2019-03-03 15:21:33 +11:00
branches_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
commit_files_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
commit_message_panel.go	fix commit message char count	2019-12-07 16:21:26 +11:00
commits_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
confirmation_panel.go	refactor confirmation prompt code	2019-11-21 22:07:14 +11:00
context.go	add contexts to views	2019-11-21 22:07:14 +11:00
credentials_panel.go	do not return focus to commitsFiles view after selecting to start a new patch	2019-11-05 19:22:01 +11:00
file_watching.go	don't watch deleted files	2020-01-08 21:57:39 +11:00
files_panel.go	keep track of current view when pushing	2020-01-12 11:17:20 +11:00
git_flow.go	add git flow support	2020-01-08 22:03:15 +11:00
gui.go	use view line height to see if you should stop scrolling	2020-01-12 13:55:14 +11:00
keybindings.go	add reflog reset options	2020-01-09 22:36:07 +11:00
line_by_line_panel.go	add contexts to views	2019-11-21 22:07:14 +11:00
list_view.go	reset origin when clicking on list item	2020-01-12 13:55:14 +11:00
menu_panel.go	fix display of menu option keybindings	2020-01-07 13:26:29 -08:00
merge_panel.go	Missed a spot with this new string task thing	2020-01-12 14:43:17 +11:00
options_menu_panel.go	fixed keybinding display in merge_panel.go	2020-01-07 09:50:25 -08:00
patch_building_panel.go	add contexts to views	2019-11-21 22:07:14 +11:00
patch_options_panel.go	add contexts to views	2019-11-21 22:07:14 +11:00
quitting.go	allow for changing the current directory on exit	2019-11-11 21:45:31 +11:00
rebase_options_panel.go	add mouse support	2019-11-10 22:32:13 +11:00
recent_repos_panel.go	Rely on model rather than view to focus a point	2019-03-23 11:54:25 +11:00
reflog_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
reflog_reset_options_panel.go	add reflog reset options	2020-01-09 22:36:07 +11:00
remote_branches_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
remotes_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
staging_panel.go	add mouse support	2019-11-10 22:32:13 +11:00
stash_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
status_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
tags_panel.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
tasks_adapter.go	allow fast flicking through any list panel	2020-01-12 11:17:20 +11:00
updates.go	do not return focus to commitsFiles view after selecting to start a new patch	2019-11-05 19:22:01 +11:00
view_helpers.go	stop the files panel from stealing focus whenever files are refreshed	2019-12-08 21:27:28 +11:00
workspace_reset_options_panel.go	refresh side panels when resetting to upstream	2020-01-08 22:30:54 +11:00