From 28501fbf77c18189bb1016da2ff17d15a32bc1bd Mon Sep 17 00:00:00 2001 From: AzraelSec Date: Sat, 15 Apr 2023 10:42:36 +0200 Subject: [PATCH] chore: add focus on local commits after interactively rebase --- pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index 9cb8f4a15..981b85a0d 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -218,7 +218,10 @@ func (self *MergeAndRebaseHelper) RebaseOntoRef(ref string) error { OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.RebaseBranch) err := self.git.Rebase.EditRebase(ref) - return self.CheckMergeOrRebase(err) + if err = self.CheckMergeOrRebase(err); err != nil { + return err + } + return self.c.PushContext(self.contexts.LocalCommits) }, }, }