diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-18 23:27:54 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-02-18 23:27:54 +1100 |
commit | d44638130c8d07c648b45796cc6b0dff221c7d82 (patch) | |
tree | 71b1bfdc271de1cac8fffe223d23fe7295c0158d /pkg/gui/status_panel.go | |
parent | 76a27f417fc7fd24b4fdf12f0aeeb94ecca958d3 (diff) |
add various interactive rebase commands
Diffstat (limited to 'pkg/gui/status_panel.go')
-rw-r--r-- | pkg/gui/status_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index 06b94d722..a6bed8f83 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -94,11 +94,11 @@ func (gui *Gui) updateWorkTreeState() error { gui.State.WorkingTreeState = "merging" return nil } - rebasing, err := gui.GitCommand.IsInRebaseState() + rebaseMode, err := gui.GitCommand.RebaseMode() if err != nil { return err } - if rebasing { + if rebaseMode != "" { gui.State.WorkingTreeState = "rebasing" return nil } |