summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
AgeCommit message (Expand)Author
2023-04-15chore: add focus on local commits after interactively rebaseAzraelSec
2023-04-15feat: allow to perform a rebase with breaking before the first commitAzraelSec
2023-02-25fix PullMergeConflict integration testJesse Duffield
2022-08-07move merge conflicts code into controllerJesse Duffield
2022-08-06rename merging context to mergeConflictsJesse Duffield
2022-08-01fix popup focus issueJesse Duffield
2022-05-08rename displayString to label for menu itemsJesse Duffield
2022-03-30pkg/gui: Rename IPopupHandler::Ask() to Confirm()Moritz Haase
2022-03-27fix copy for merge confirmationJesse Duffield
2022-03-27add menu keybindings for various thingsJesse Duffield
2022-03-24many more genericsJesse Duffield
2022-03-17refactor controllersJesse Duffield