diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2023-06-11 08:08:55 +0200 |
---|---|---|
committer | Stefan Haller <stefan@haller-berlin.de> | 2023-07-31 08:41:41 +0200 |
commit | 66de981e9108c83ddb1d778eb92e948050c85311 (patch) | |
tree | fcc5c35ee5909cd71157c331ef10beb200fe05ee /pkg/gui/context | |
parent | 375451785c2f72da368e0cafaff9dc2e9f40a5b4 (diff) |
Add a "Mark commit as base commit for rebase" command
This allows to do the equivalent of "git rebase --onto <target> <base>", by
first marking the <base> commit with the new command, and then selecting the
target branch and invoking the usual rebase command there.
Diffstat (limited to 'pkg/gui/context')
-rw-r--r-- | pkg/gui/context/local_commits_context.go | 1 | ||||
-rw-r--r-- | pkg/gui/context/sub_commits_context.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkg/gui/context/local_commits_context.go b/pkg/gui/context/local_commits_context.go index 417a4f30a..f8f7848f2 100644 --- a/pkg/gui/context/local_commits_context.go +++ b/pkg/gui/context/local_commits_context.go @@ -49,6 +49,7 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext { c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL, c.Modes().CherryPicking.SelectedShaSet(), c.Modes().Diffing.Ref, + c.Modes().MarkedBaseCommit.GetSha(), c.UserConfig.Gui.TimeFormat, c.UserConfig.Gui.ShortTimeFormat, time.Now(), diff --git a/pkg/gui/context/sub_commits_context.go b/pkg/gui/context/sub_commits_context.go index ba2f5e3f6..2643d294b 100644 --- a/pkg/gui/context/sub_commits_context.go +++ b/pkg/gui/context/sub_commits_context.go @@ -65,6 +65,7 @@ func NewSubCommitsContext( c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL, c.Modes().CherryPicking.SelectedShaSet(), c.Modes().Diffing.Ref, + "", c.UserConfig.Gui.TimeFormat, c.UserConfig.Gui.ShortTimeFormat, time.Now(), |