summaryrefslogtreecommitdiffstats
path: root/pkg/gui/branches_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-03-29 10:11:15 +1100
committerJesse Duffield <jessedduffield@gmail.com>2020-03-29 11:37:29 +1100
commita2790cfe8e6705ebd81c63df2154ec82cb645ae3 (patch)
treeba41523fe4726471a8dfab7c29c93a0365dcb67b /pkg/gui/branches_panel.go
parent624ae45ebb3f54499a25c4eba0844fa971277c34 (diff)
rename to filtered mode
Diffstat (limited to 'pkg/gui/branches_panel.go')
-rw-r--r--pkg/gui/branches_panel.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go
index 3d1692844..c7cba8aea 100644
--- a/pkg/gui/branches_panel.go
+++ b/pkg/gui/branches_panel.go
@@ -263,7 +263,7 @@ func (gui *Gui) deleteNamedBranch(g *gocui.Gui, v *gocui.View, selectedBranch *c
}
func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
- if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
+ if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@@ -290,7 +290,7 @@ func (gui *Gui) mergeBranchIntoCheckedOutBranch(branchName string) error {
}
func (gui *Gui) handleMerge(g *gocui.Gui, v *gocui.View) error {
- if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
+ if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}
@@ -304,7 +304,7 @@ func (gui *Gui) handleRebaseOntoLocalBranch(g *gocui.Gui, v *gocui.View) error {
}
func (gui *Gui) handleRebaseOntoBranch(selectedBranchName string) error {
- if ok, err := gui.validateNotInScopedMode(); err != nil || !ok {
+ if ok, err := gui.validateNotInFilterMode(); err != nil || !ok {
return err
}