summaryrefslogtreecommitdiffstats
path: root/pkg/gui/gui.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-12-05 22:30:10 +1100
committerJesse Duffield <jessedduffield@gmail.com>2018-12-11 09:39:54 +1100
commite0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (patch)
tree137f8360a1416b08cc6c327ba47b07a4670366d6 /pkg/gui/gui.go
parentcce6f405a5643ed46a6bc0b9fd7cf132c915c9f3 (diff)
more work on rebasing including visual indicators
Diffstat (limited to 'pkg/gui/gui.go')
-rw-r--r--pkg/gui/gui.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
index 26ebd5f2b..ef41482c9 100644
--- a/pkg/gui/gui.go
+++ b/pkg/gui/gui.go
@@ -125,6 +125,7 @@ type guiState struct {
Platform commands.Platform
Updating bool
Panels *panelStates
+ WorkingTreeState string // one of "merging", "rebasing", "normal"
}
// NewGui builds a new gui handler