summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
AgeCommit message (Expand)Author
2022-08-07move merge conflicts code into controllerJesse Duffield
2022-08-06rename merging context to mergeConflictsJesse Duffield
2022-08-06refactor to only have one context per viewJesse Duffield
2022-04-06feat(merge_panel): Add open/edit files in merge conflict panelRyooooooga
2022-03-19update lintersJesse Duffield
2022-03-17working againJesse Duffield
2022-03-17move all refresh code into the one fileJesse Duffield
2022-03-17move context keys into context packageJesse Duffield
2022-03-17start moving commit panel handlers into controllerJesse Duffield
2022-03-17start refactoring guiJesse Duffield
2022-01-27better locking of merge panel stateJesse Duffield
2022-01-26improve merge conflict flowJesse Duffield
2022-01-17make integration test passJesse Duffield
2022-01-16fix merge scroll bugJesse Duffield
2022-01-15avoid deadlock in merge panelJesse Duffield
2022-01-15stop refreshing the screen so muchJesse Duffield
2022-01-09shorten nameJesse Duffield
2022-01-09start breaking up git structJesse Duffield
2022-01-07refactorJesse Duffield
2022-01-04more refactoringJesse Duffield
2022-01-04updating specsJesse Duffield
2022-01-04align Gui struct with GitCommandJesse Duffield
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 15:39:32 +0000