go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-17 12:06:38 +02:00
Code Issues Releases Activity

PickBothHunks -> pickBothHunks

Browse Source
This commit is contained in:
David Chen 2020-01-06 23:37:21 +08:00
parent 86b101c410
commit 0ddf7c05c8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Config.md
View File

@ -119,7 +119,7 @@ Default path for the config file: `~/.config/jesseduffield/lazygit/config.yml`
toggleDragSelect: 'v' toggleDragSelect: 'v'
toggleDragSelect-alt: 'V' toggleDragSelect-alt: 'V'
toggleSelectHunk: 'a' toggleSelectHunk: 'a'
PickBothHunks: 'b' pickBothHunks: 'b'
undo: 'z' undo: 'z'
``` ```

2
pkg/config/app_config.go
View File

@ -352,7 +352,7 @@ keybinding:
toggleDragSelect: 'v' toggleDragSelect: 'v'
toggleDragSelect-alt: 'V' toggleDragSelect-alt: 'V'
toggleSelectHunk: 'a' toggleSelectHunk: 'a'
PickBothHunks: 'b' pickBothHunks: 'b'
undo: 'z' undo: 'z'
`) `)
} }

2
pkg/gui/keybindings.go
View File

@ -1260,7 +1260,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
{ {
ViewName: "main", ViewName: "main",
Contexts: []string{"merging"}, Contexts: []string{"merging"},
Key: gui.getKey("main.PickBothHunks"), Key: gui.getKey("main.pickBothHunks"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handlePickBothHunks, Handler: gui.handlePickBothHunks,
Description: gui.Tr.SLocalize("PickBothHunks"), Description: gui.Tr.SLocalize("PickBothHunks"),