diff options
Diffstat (limited to 'pkg/gui/status_panel.go')
| -rw-r--r-- | pkg/gui/status_panel.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index 39d85411e..4c69e9b30 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -136,20 +136,20 @@ func lazygitTitle() string { } func (gui *Gui) updateWorkTreeState() error { - merging, err := gui.GitCommand.IsInMergeState() + rebaseMode, err := gui.GitCommand.RebaseMode() if err != nil { return err } - if merging { - gui.State.WorkingTreeState = "merging" + if rebaseMode != "" { + gui.State.WorkingTreeState = "rebasing" return nil } - rebaseMode, err := gui.GitCommand.RebaseMode() + merging, err := gui.GitCommand.IsInMergeState() if err != nil { return err } - if rebaseMode != "" { - gui.State.WorkingTreeState = "rebasing" + if merging { + gui.State.WorkingTreeState = "merging" return nil } gui.State.WorkingTreeState = "normal" |