diff options
author | AzraelSec <federicogerardi94@gmail.com> | 2023-04-15 10:42:36 +0200 |
---|---|---|
committer | AzraelSec <federicogerardi94@gmail.com> | 2023-04-15 10:42:36 +0200 |
commit | 28501fbf77c18189bb1016da2ff17d15a32bc1bd (patch) | |
tree | 1e8b54f8d351df3f835760881cb56f99ac3bbd99 /pkg/gui/controllers/helpers | |
parent | 8f1f7128417169eb2f3692a49a06996980130c97 (diff) |
chore: add focus on local commits after interactively rebase
Diffstat (limited to 'pkg/gui/controllers/helpers')
-rw-r--r-- | pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 5 |
1 files changed, 4 insertions, 1 deletions
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) }, }, } |