summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Chen <weichen2000121@gmail.com>2020-01-06 23:37:21 +0800
committerDavid Chen <weichen2000121@gmail.com>2020-01-06 23:37:21 +0800
commit0ddf7c05c854f9542fd9939c98b946baabe64852 (patch)
treebb993ecf4240694b8962c7379003d9ef5ce25d1e
parent86b101c410b0ec2b7eaffcc81f6db44002801b6e (diff)
PickBothHunks -> pickBothHunks
-rw-r--r--docs/Config.md2
-rw-r--r--pkg/config/app_config.go2
-rw-r--r--pkg/gui/keybindings.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/Config.md b/docs/Config.md
index 22f63229c..fd054119f 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -119,7 +119,7 @@ Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
toggleDragSelect: 'v'
toggleDragSelect-alt: 'V'
toggleSelectHunk: 'a'
- PickBothHunks: 'b'
+ pickBothHunks: 'b'
undo: 'z'
```
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 338244b91..abc650a05 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -352,7 +352,7 @@ keybinding:
toggleDragSelect: 'v'
toggleDragSelect-alt: 'V'
toggleSelectHunk: 'a'
- PickBothHunks: 'b'
+ pickBothHunks: 'b'
undo: 'z'
`)
}
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index f3c504ddb..61a27483f 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -1260,7 +1260,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
{
ViewName: "main",
Contexts: []string{"merging"},
- Key: gui.getKey("main.PickBothHunks"),
+ Key: gui.getKey("main.pickBothHunks"),
Modifier: gocui.ModNone,
Handler: gui.handlePickBothHunks,
Description: gui.Tr.SLocalize("PickBothHunks"),