go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-12-13 23:45:45 +02:00
Code Issues Releases Activity

rename to filtered mode

Browse Source
This commit is contained in:
Jesse Duffield
2020-03-29 10:11:15 +11:00
parent 624ae45ebb
commit a2790cfe8e
14 changed files with 106 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/gui/branches_panel.go
View File

@@ -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
}