summaryrefslogtreecommitdiffstats
path: root/pkg/gui/rebase_options_panel.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
-rw-r--r--pkg/gui/rebase_options_panel.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go
index bc3dd13f0..bf29d19c3 100644
--- a/pkg/gui/rebase_options_panel.go
+++ b/pkg/gui/rebase_options_panel.go
@@ -26,8 +26,13 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error
options = append(options, &option{value: "skip"})
}
+ options = append(options, &option{value: "cancel"})
+
handleMenuPress := func(index int) error {
command := options[index].value
+ if command == "cancel" {
+ return nil
+ }
return gui.genericMergeCommand(command)
}