summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
AgeCommit message (Expand)Author
2021-11-05support scrolling left and rightJesse Duffield
2021-11-01support aborting a merge or rebase with escJesse Duffield
2021-08-25Fix translationsRyooooooga
2021-08-25Fix `pick all hunks`Ryooooooga
2021-08-25Support `git config merge.conflictStyle diff3`Ryooooooga
2021-04-18refactor merge panelJesse Duffield
2021-04-11full coverage for logging commandsJesse Duffield
2021-04-11better way of scrolling to a merge conflictJesse Duffield
2021-04-06more refactoringJesse Duffield
2021-04-06testJesse Duffield
2021-04-06refactorJesse Duffield
2021-04-06refactor of contexts and filteringJesse Duffield
2021-04-02better handling of scrolling for conflicted filesJesse Duffield
2021-04-02refactorJesse Duffield
2021-04-02add mutex to prevent crashes with merge conflictsJesse Duffield
2021-04-02big refactor to give our enums actual typesJesse Duffield
2020-11-28Start on supporting auto-suggestions when checking out a branchJesse Duffield
2020-11-18fix lint errorsJesse Duffield
2020-10-10type i18nJesse Duffield
2020-10-10remove viperJesse Duffield
2020-09-26add in-built logging support for a better dev experienceJesse Duffield
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 22:55:20 +0000