Merge branch 'master' into feat/preferRemotes

jesseduffield · Dec 19, 2024 · 9912cb5 · 9912cb5
2 parents 38601af + 13e9e1d
commit 9912cb5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/docs/Config.md b/docs/Config.md
@@ -331,7 +331,7 @@ git:
   branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
 
   # Command used to display git log of all branches in the main window.
-  # Deprecated: User `allBranchesLogCmds` instead.
+  # Deprecated: Use `allBranchesLogCmds` instead.
   allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
 
   # If true, do not spawn a separate process when using GPG

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
@@ -242,7 +242,7 @@ type GitConfig struct {
 	// Command used when displaying the current branch git log in the main window
 	BranchLogCmd string `yaml:"branchLogCmd"`
 	// Command used to display git log of all branches in the main window.
-	// Deprecated: User `allBranchesLogCmds` instead.
+	// Deprecated: Use `allBranchesLogCmds` instead.
 	AllBranchesLogCmd string `yaml:"allBranchesLogCmd"`
 	// Commands used to display git log of all branches in the main window, they will be cycled in order of appearance
 	AllBranchesLogCmds []string `yaml:"allBranchesLogCmds"`

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
@@ -193,18 +193,6 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
 			Tooltip:     self.c.Tr.OpenCommandLogMenuTooltip,
 			OpensMenu:   true,
 		},
-		{
-			ViewName: "secondary",
-			Key:      gocui.MouseWheelUp,
-			Modifier: gocui.ModNone,
-			Handler:  self.scrollUpSecondary,
-		},
-		{
-			ViewName: "secondary",
-			Key:      gocui.MouseWheelDown,
-			Modifier: gocui.ModNone,
-			Handler:  self.scrollDownSecondary,
-		},
 		{
 			ViewName:    "main",
 			Key:         gocui.MouseWheelDown,
@@ -219,6 +207,12 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
 			Description: self.c.Tr.ScrollUp,
 			Alternative: "fn+down",
 		},
+		{
+			ViewName: "secondary",
+			Key:      gocui.MouseWheelDown,
+			Modifier: gocui.ModNone,
+			Handler:  self.scrollDownSecondary,
+		},
 		{
 			ViewName: "secondary",
 			Key:      gocui.MouseWheelUp,

diff --git a/schema/config.json b/schema/config.json
@@ -616,7 +616,7 @@
         },
         "allBranchesLogCmd": {
           "type": "string",
-          "description": "Command used to display git log of all branches in the main window.\nDeprecated: User `allBranchesLogCmds` instead.",
+          "description": "Command used to display git log of all branches in the main window.\nDeprecated: Use `allBranchesLogCmds` instead.",
           "default": "git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium"
         },
         "allBranchesLogCmds": {