summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
AgeCommit message (Expand)Author
2020-08-23fix focus change on merge popup returnJesse Duffield
2020-08-23use context to return to the correct viewJesse Duffield
2020-08-23centralise logic for rendering options mapJesse Duffield
2020-08-23minor refactorJesse Duffield
2020-08-23more standardisationJesse Duffield
2020-08-23WIPJesse Duffield
2020-08-23WIPJesse Duffield
2020-08-23standardise getting selected itemJesse Duffield
2020-08-23WIPJesse Duffield
2020-08-15more removing of gJesse Duffield
2020-08-15renameJesse Duffield
2020-08-15clean up interface for popup panelsJesse Duffield
2020-05-19allow user to scroll themselves inside merge panelv0.20.4Jesse Duffield
2020-05-19fix race condition when scrolling to merge conflictJesse Duffield
2020-05-15prevent flicker from bolding background of selected lineJesse Duffield
2020-05-13standardise how we handle background coloursv0.20.3Jesse Duffield
2020-03-29add new diff modeJesse Duffield
2020-03-29fix conflict race conditionJesse Duffield
2020-03-28move working tree state function into git.goJesse Duffield
2020-03-28smart refreshing filesJesse Duffield
2020-03-28more centralised handling of refreshingJesse Duffield
2020-03-25redoingJesse Duffield
2020-03-09big golangci-lint cleanupJesse Duffield
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 21:39:48 +0000