1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-21 22:43:27 +02:00

suggested keybinding improvements

This commit is contained in:
David Chen 2019-12-06 22:36:52 -08:00
parent c89c35c6b3
commit e425f1df87
2 changed files with 19 additions and 19 deletions

View File

@ -283,6 +283,7 @@ keybinding:
optionMenu: 'x' optionMenu: 'x'
optionMenu-alt1: '?' optionMenu-alt1: '?'
select: '<space>' select: '<space>'
goInto: '<enter>'
remove: 'd' remove: 'd'
new: 'n' new: 'n'
edit: 'e' edit: 'e'
@ -293,14 +294,17 @@ keybinding:
scrollDownMain-alt1: 'J' scrollDownMain-alt1: 'J'
scrollUpMain-alt2: '<c-u>' scrollUpMain-alt2: '<c-u>'
scrollDownMain-alt2: '<c-d>' scrollDownMain-alt2: '<c-d>'
executeCustomCommand: 'X'
createRebaseOptionsMenu: 'm' createRebaseOptionsMenu: 'm'
pushFiles: 'P' pushFiles: 'P'
pullFiles: 'p' pullFiles: 'p'
refresh: 'R' refresh: 'R'
createPatchOptionsMenu: '<c-p>' createPatchOptionsMenu: '<c-p>'
nextBranchTab: ']'
prevBranchTab: '['
status: status:
checkForUpdate: 'u' checkForUpdate: 'u'
recentRepos: 's' recentRepos: '<enter>'
files: files:
commitChanges: 'c' commitChanges: 'c'
commitChangesWithoutHook: 'w' commitChangesWithoutHook: 'w'
@ -313,24 +317,21 @@ keybinding:
toggleStagedAll: 'a' toggleStagedAll: 'a'
viewResetOptions: 'D' viewResetOptions: 'D'
fetch: 'f' fetch: 'f'
executeCustomCommand: 'X'
branches: branches:
createPullRequest: 'o' createPullRequest: 'o'
checkoutBranchesByName: 'c' checkoutBranchByName: 'c'
forceCheckoutBranch: 'F' forceCheckoutBranch: 'F'
rebaseBranch: 'r' rebaseBranch: 'r'
mergeIntoCurrentBranch: 'M' mergeIntoCurrentBranch: 'M'
FastForward: 'f' fastForward: 'f'
pushTag: 'P' pushTag: 'P'
nextBranchTab: ']'
prevBranchTab: '['
setUpstream: 'u' setUpstream: 'u'
commits: commits:
squashDown: 's' squashDown: 's'
renameCommit: 'r' renameCommit: 'r'
renameCommitWithEditor: 'R' renameCommitWithEditor: 'R'
resetToThisCommit: 'g' viewResetOptions: 'g'
fixupCommit: 'f' markCommitAsFixup: 'f'
createFixupCommit: 'F' createFixupCommit: 'F'
squashAboveCommits: 'S' squashAboveCommits: 'S'
moveDownCommit: '<c-j>' moveDownCommit: '<c-j>'
@ -341,7 +342,6 @@ keybinding:
cherryPickCopy: 'c' cherryPickCopy: 'c'
cherryPickCopyRange: 'C' cherryPickCopyRange: 'C'
pasteCommits: 'v' pasteCommits: 'v'
viewCommitFiles: '<enter>'
tagCommit: 'T' tagCommit: 'T'
stash: stash:
popStash: 'g' popStash: 'g'

View File

@ -594,7 +594,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
}, },
{ {
ViewName: "files", ViewName: "files",
Key: gocui.KeyEnter, Key: gui.getKey("universal.goInto"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleEnterFile, Handler: gui.handleEnterFile,
Description: gui.Tr.SLocalize("StageLines"), Description: gui.Tr.SLocalize("StageLines"),
@ -608,7 +608,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
}, },
{ {
ViewName: "files", ViewName: "files",
Key: gui.getKey("files.executeCustomCommand"), Key: gui.getKey("universal.executeCustomCommand"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCustomCommand, Handler: gui.handleCustomCommand,
Description: gui.Tr.SLocalize("executeCustomCommand"), Description: gui.Tr.SLocalize("executeCustomCommand"),
@ -632,7 +632,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
{ {
ViewName: "branches", ViewName: "branches",
Contexts: []string{"local-branches"}, Contexts: []string{"local-branches"},
Key: gui.getKey("branches.checkoutBranchesByName"), Key: gui.getKey("branches.checkoutBranchByName"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCheckoutByName, Handler: gui.handleCheckoutByName,
Description: gui.Tr.SLocalize("checkoutByName"), Description: gui.Tr.SLocalize("checkoutByName"),
@ -719,13 +719,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
}, },
{ {
ViewName: "branches", ViewName: "branches",
Key: gui.getKey("branches.nextBranchTab"), Key: gui.getKey("universal.nextBranchTab"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleNextBranchesTab, Handler: gui.handleNextBranchesTab,
}, },
{ {
ViewName: "branches", ViewName: "branches",
Key: gui.getKey("branches.prevBranchTab"), Key: gui.getKey("universal.prevBranchTab"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handlePrevBranchesTab, Handler: gui.handlePrevBranchesTab,
}, },
@ -760,14 +760,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
}, },
{ {
ViewName: "commits", ViewName: "commits",
Key: gui.getKey("commits.resetToThisCommit"), Key: gui.getKey("commits.viewResetOptions"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCreateCommitResetMenu, Handler: gui.handleCreateCommitResetMenu,
Description: gui.Tr.SLocalize("resetToThisCommit"), Description: gui.Tr.SLocalize("resetToThisCommit"),
}, },
{ {
ViewName: "commits", ViewName: "commits",
Key: gui.getKey("commits.fixupCommit"), Key: gui.getKey("commits.markCommitAsFixup"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleCommitFixup, Handler: gui.handleCommitFixup,
Description: gui.Tr.SLocalize("fixupCommit"), Description: gui.Tr.SLocalize("fixupCommit"),
@ -858,7 +858,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
}, },
{ {
ViewName: "commits", ViewName: "commits",
Key: gui.getKey("commits.viewCommitFiles"), Key: gui.getKey("universal.goInto"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleSwitchToCommitFilesPanel, Handler: gui.handleSwitchToCommitFilesPanel,
Description: gui.Tr.SLocalize("viewCommitFiles"), Description: gui.Tr.SLocalize("viewCommitFiles"),
@ -977,7 +977,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
}, },
{ {
ViewName: "commitFiles", ViewName: "commitFiles",
Key: gocui.KeyEnter, Key: gui.getKey("universal.goInto"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleEnterCommitFile, Handler: gui.handleEnterCommitFile,
Description: gui.Tr.SLocalize("enterFile"), Description: gui.Tr.SLocalize("enterFile"),
@ -1341,7 +1341,7 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
{ {
ViewName: "branches", ViewName: "branches",
Contexts: []string{"remotes"}, Contexts: []string{"remotes"},
Key: gocui.KeyEnter, Key: gui.getKey("universal.goInto"),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: gui.handleRemoteEnter, Handler: gui.handleRemoteEnter,
}, },