summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
AgeCommit message (Expand)Author
2020-01-12Missed a spot with this new string task thingJesse Duffield
2020-01-12allow fast flicking through any list panelJesse Duffield
2020-01-07cleanupDavid Chen
2020-01-07fixed keybinding display in merge_panel.goDavid Chen
2019-11-08support ours/theirs merge conflict headersJesse Duffield
2019-11-05do not return focus to commitsFiles view after selecting to start a new patchJesse Duffield
2019-10-20Added light theme option to the settingsmjarkk
2019-03-03i18n for rebase loading statesJesse Duffield
2019-03-02mouse supportJesse Duffield Duffield
2019-02-16fix golangci errorsJesse Duffield
2019-02-16more work on rebasing featureJesse Duffield
2019-02-16introduce panel contexts and more work on rebasingJesse Duffield
2018-12-11Make merge panel its own panelJesse Duffield
2018-12-11more work on rebasing including visual indicatorsJesse Duffield
2018-12-11Making ci happierGlenn Vriesman
2018-12-11Added check to invoke continue/refreshGlenn Vriesman
2018-12-08fetching branches without checking outJesse Duffield
2018-08-28dont panic when catting directoriesJesse Duffield
2018-08-16Fixed comment on issue #137 from @jesseduffieldMark Kopenga
2018-08-15Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.goMark Kopenga
2018-08-14tried to update to latest masterMark Kopenga