diff options
69 files changed, 196 insertions, 195 deletions
diff --git a/docs/Config.md b/docs/Config.md index 312fd77f2..917db0578 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -207,18 +207,18 @@ keybinding: checkForUpdate: 'u' recentRepos: '<enter>' files: - commitChanges: 'c' - commitChangesWithoutHook: 'w' # commit changes without pre-commit hook + commit: 'c' + commitWithoutHook: 'w' # commit changes without pre-commit hook amendLastCommit: 'A' commitChangesWithEditor: 'C' findBaseCommitForFixup: '<c-f>' confirmDiscard: 'x' ignoreFile: 'i' refreshFiles: 'r' - stashAllChanges: 's' + stash: 's' viewStashOptions: 'S' toggleStagedAll: 'a' # stage/unstage all - viewResetOptions: 'D' + reset: 'D' fetch: 'f' toggleTreeView: '`' openMergeTool: 'M' @@ -230,30 +230,31 @@ keybinding: forceCheckoutBranch: 'F' rebaseBranch: 'r' renameBranch: 'R' - mergeIntoCurrentBranch: 'M' + merge: 'M' viewGitFlowOptions: 'i' fastForward: 'f' # fast-forward this branch from its upstream - createTag: 'T' + newTag: 'T' pushTag: 'P' setUpstream: 'u' # set as upstream of checked-out branch - fetchRemote: 'f' + fetch: 'f' commits: - squashDown: 's' - renameCommit: 'r' - renameCommitWithEditor: 'R' + squash: 's' + reword: 'r' + rewordWithEditor: 'R' viewResetOptions: 'g' - markCommitAsFixup: 'f' + fixup: 'f' createFixupCommit: 'F' # create fixup commit for this commit - squashAboveCommits: 'S' + applyFixupCommits: 'S' moveDownCommit: '<c-j>' # move commit down one moveUpCommit: '<c-k>' # move commit up one - amendToCommit: 'A' - pickCommit: 'p' # pick commit (when mid-rebase) - revertCommit: 't' + amend: 'A' + amendCommitAttribute: 'a' + pick: 'p' # pick commit (when mid-rebase) + revert: 't' cherryPickCopy: 'C' pasteCommits: 'V' tagCommit: 'T' - checkoutCommit: '<space>' + checkout: '<space>' resetCherryPick: '<c-R>' copyCommitMessageToClipboard: '<c-y>' openLogMenu: '<c-l>' @@ -262,7 +263,7 @@ keybinding: popStash: 'g' renameStash: 'r' commitFiles: - checkoutCommitFile: 'c' + checkout: 'c' main: toggleSelectHunk: 'a' pickBothHunks: 'b' diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index 0069c75b0..3f754af9a 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -364,23 +364,23 @@ type KeybindingStatusConfig struct { } type KeybindingFilesConfig struct { - CommitChanges string `yaml:"commitChanges"` - CommitChangesWithoutHook string `yaml:"commitChangesWithoutHook"` - AmendLastCommit string `yaml:"amendLastCommit"` - CommitChangesWithEditor string `yaml:"commitChangesWithEditor"` - FindBaseCommitForFixup string `yaml:"findBaseCommitForFixup"` - ConfirmDiscard string `yaml:"confirmDiscard"` - IgnoreFile string `yaml:"ignoreFile"` - RefreshFiles string `yaml:"refreshFiles"` - StashAllChanges string `yaml:"stashAllChanges"` - ViewStashOptions string `yaml:"viewStashOptions"` - ToggleStagedAll string `yaml:"toggleStagedAll"` - ViewResetOptions string `yaml:"viewResetOptions"` - Fetch string `yaml:"fetch"` - ToggleTreeView string `yaml:"toggleTreeView"` - OpenMergeTool string `yaml:"openMergeTool"` - OpenStatusFilter string `yaml:"openStatusFilter"` - CopyFileInfoToClipboard string `yaml:"copyFileInfoToClipboard"` + Commit string `yaml:"commit"` + CommitWithoutHook string `yaml:"commitWithoutHook"` + AmendLastCommit string `yaml:"amendLastCommit"` + CommitChangesWithEditor string `yaml:"commitChangesWithEditor"` + FindBaseCommitForFixup string `yaml:"findBaseCommitForFixup"` + ConfirmDiscard string `yaml:"confirmDiscard"` + IgnoreFile string `yaml:"ignoreFile"` + RefreshFiles string `yaml:"refreshFiles"` + Stash string `yaml:"stash"` + ViewStashOptions string `yaml:"viewStashOptions"` + ToggleStagedAll string `yaml:"toggleStagedAll"` + Reset string `yaml:"reset"` + Fetch string `yaml:"fetch"` + ToggleTreeView string `yaml:"toggleTreeView"` + OpenMergeTool string `yaml:"openMergeTool"` + OpenStatusFilter string `yaml:"openStatusFilter"` + CopyFileInfoToClipboard string `yaml:"copyFileInfoToClipboard"` } type KeybindingBranchesConfig struct { @@ -391,13 +391,13 @@ type KeybindingBranchesConfig struct { ForceCheckoutBranch string `yaml:"forceCheckoutBranch"` RebaseBranch string `yaml:"rebaseBranch"` RenameBranch string `yaml:"renameBranch"` - MergeIntoCurrentBranch string `yaml:"mergeIntoCurrentBranch"` + Merge string `yaml:"merge"` ViewGitFlowOptions string `yaml:"viewGitFlowOptions"` FastForward string `yaml:"fastForward"` - CreateTag string `yaml:"createTag"` + NewTag string `yaml:"newTag"` PushTag string `yaml:"pushTag"` SetUpstream string `yaml:"setUpstream"` - FetchRemote string `yaml:"fetchRemote"` + Fetch string `yaml:"fetch"` SortOrder string `yaml:"sortOrder"` } @@ -406,24 +406,24 @@ type KeybindingWorktreesConfig struct { } type KeybindingCommitsConfig struct { - SquashDown string `yaml:"squashDown"` - RenameCommit string `yaml:"renameCommit"` - RenameCommitWithEditor string `yaml:"renameCommitWithEditor"` + Squash string `yaml:"squash"` + Reword string `yaml:"reword"` + RewordWithEditor string `yaml:"rewordWithEditor"` ViewResetOptions string `yaml:"viewResetOptions"` - MarkCommitAsFixup string `yaml:"markCommitAsFixup"` + Fixup string `yaml:"fixup"` CreateFixupCommit string `yaml:"createFixupCommit"` - SquashAboveCommits string `yaml:"squashAboveCommits"` + ApplyFixupCommits string `yaml:"applyFixupCommits"` MoveDownCommit string `yaml:"moveDownCommit"` MoveUpCommit string `yaml:"moveUpCommit"` - AmendToCommit string `yaml:"amendToCommit"` - ResetCommitAuthor string `yaml:"resetCommitAuthor"` - PickCommit string `yaml:"pickCommit"` - RevertCommit string `yaml:"revertCommit"` + Amend string `yaml:"amend"` + AmendCommitAttribute string `yaml:"amendCommitAttribute"` + Pick string `yaml:"pick"` + Revert string `yaml:"revert"` CherryPickCopy string `yaml:"cherryPickCopy"` PasteCommits string `yaml:"pasteCommits"` MarkCommitAsBaseForRebase string `yaml:"markCommitAsBaseForRebase"` CreateTag string `yaml:"tagCommit"` - CheckoutCommit string `yaml:"checkoutCommit"` + Checkout string `yaml:"checkout"` ResetCherryPick string `yaml:"resetCherryPick"` CopyCommitAttributeToClipboard string `yaml:"copyCommitAttributeToClipboard"` OpenLogMenu string `yaml:"openLogMenu"` @@ -438,7 +438,7 @@ type KeybindingStashConfig struct { } type KeybindingCommitFilesConfig struct { - CheckoutCommitFile string `yaml:"checkoutCommitFile"` + Checkout string `yaml:"checkout"` } type KeybindingMainConfig struct { @@ -762,23 +762,23 @@ func GetDefaultConfig() *UserConfig { AllBranchesLogGraph: "a", }, Files: KeybindingFilesConfig{ - CommitChanges: "c", - CommitChangesWithoutHook: "w", - AmendLastCommit: "A", - CommitChangesWithEditor: "C", - FindBaseCommitForFixup: "<c-f>", - IgnoreFile: "i", - RefreshFiles: "r", - StashAllChanges: "s", - ViewStashOptions: "S", - ToggleStagedAll: "a", - ViewResetOptions: "D", - Fetch: "f", - ToggleTreeView: "`", - OpenMergeTool: "M", - OpenStatusFilter: "<c-b>", - ConfirmDiscard: "x", - CopyFileInfoToClipboard: "y", + Commit: "c", + CommitWithoutHook: "w", + AmendLastCommit: "A", + CommitChangesWithEditor: "C", + FindBaseCommitForFixup: "<c-f>", + IgnoreFile: "i", + RefreshFiles: "r", + Stash: "s", + ViewStashOptions: "S", + ToggleStagedAll: "a", + Reset: "D", + Fetch: "f", + ToggleTreeView: "`", + OpenMergeTool: "M", + OpenStatusFilter: "<c-b>", + ConfirmDiscard: "x", + CopyFileInfoToClipboard: "y", }, Branches: KeybindingBranchesConfig{ CopyPullRequestURL: "<c-y>", @@ -788,37 +788,37 @@ func GetDefaultConfig() *UserConfig { ForceCheckoutBranch: "F", RebaseBranch: "r", RenameBranch: "R", - MergeIntoCurrentBranch: "M", + Merge: "M", ViewGitFlowOptions: "i", FastForward: "f", - CreateTag: "T", + NewTag: "T", PushTag: "P", SetUpstream: "u", - FetchRemote: "f", + Fetch: "f", SortOrder: "s", }, Worktrees: KeybindingWorktreesConfig{ ViewWorktreeOptions: "w", }, Commits: KeybindingCommitsConfig{ - SquashDown: "s", - RenameCommit: "r", - RenameCommitWithEditor: "R", + Squash: "s", + Reword: "r", + RewordWithEditor: "R", ViewResetOptions: "g", - MarkCommitAsFixup: "f", + Fixup: "f", CreateFixupCommit: "F", - SquashAboveCommits: "S", + ApplyFixupCommits: "S", MoveDownCommit: "<c-j>", MoveUpCommit: "<c-k>", - AmendToCommit: "A", - ResetCommitAuthor: "a", - PickCommit: "p", - RevertCommit: "t", + Amend: "A", + AmendCommitAttribute: "a", + Pick: "p", + Revert: "t", CherryPickCopy: "C", PasteCommits: "V", MarkCommitAsBaseForRebase: "B", CreateTag: "T", - CheckoutCommit: "<space>", + Checkout: "<space>", ResetCherryPick: "<c-R>", CopyCommitAttributeToClipboard: "y", OpenLogMenu: "<c-l>", @@ -831,7 +831,7 @@ func GetDefaultConfig() *UserConfig { RenameStash: "r", }, CommitFiles: KeybindingCommitFilesConfig{ - CheckoutCommitFile: "c", + Checkout: "c", }, Main: KeybindingMainConfig{ ToggleSelectHunk: "a", diff --git a/pkg/gui/command_log_panel.go b/pkg/gui/command_log_panel.go index 2faee3572..89c557205 100644 --- a/pkg/gui/command_log_panel.go +++ b/pkg/gui/command_log_panel.go @@ -129,7 +129,7 @@ func (gui *Gui) getRandomTip() string { ), fmt.Sprintf( "To revert a commit, press '%s' on that commit", - formattedKey(config.Commits.RevertCommit), + formattedKey(config.Commits.Revert), ), fmt.Sprintf( "To escape a mode, for example cherry-picking, patch-building, diffing, or filtering mode, you can just spam the '%s' button. Unless of course you have `quitOnTopLevelReturn` enabled in your config", @@ -151,7 +151,7 @@ func (gui *Gui) getRandomTip() string { ), fmt.Sprintf( "You can append your staged changes to an older commit by pressing '%s' on that commit", - formattedKey(config.Commits.AmendToCommit), + formattedKey(config.Commits.Amend), ), fmt.Sprintf( "You can amend the last commit with your new file changes by pressing '%s' in the files panel", diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go index 5a4e4190e..528ef3e9e 100644 --- a/pkg/gui/controllers/basic_commits_controller.go +++ b/pkg/gui/controllers/basic_commits_controller.go @@ -47,7 +47,7 @@ func NewBasicCommitsController(c *ControllerCommon, context ContainsCommits) *Ba func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.Commits.CheckoutCommit), + Key: opts.GetKey(opts.Config.Commits.Checkout), Handler: self.withItem(self.checkout), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Checkout, diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index 068238ec7..de408d6e6 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -110,7 +110,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), + Key: opts.GetKey(opts.Config.Branches.Merge), Handler: opts.Guards.OutsideFilterMode(self.merge), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Merge, @@ -125,7 +125,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty Tooltip: self.c.Tr.FastForwardTooltip, }, { - Key: opts.GetKey(opts.Config.Branches.CreateTag), + Key: opts.GetKey(opts.Config.Branches.NewTag), Handler: self.withItem(self.createTag), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.NewTag, diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index 647d6594b..62ab34e8c 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -41,7 +41,7 @@ func NewCommitFilesController( func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { bindings := []*types.Binding{ { - Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile), + Key: opts.GetKey(opts.Config.CommitFiles.Checkout), Handler: self.withItem(self.checkout), GetDisabledReason: self.require(self.singleItemSelected()), Description: self.c.Tr.Checkout, diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 504617218..e980f7e5f 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -57,14 +57,14 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types OpensMenu: true, }, { - Key: opts.GetKey(opts.Config.Files.CommitChanges), + Key: opts.GetKey(opts.Config.Files.Commit), Handler: self.c.Helpers().WorkingTree.HandleCommitPress, Description: self.c.Tr.Commit, Tooltip: self.c.Tr.CommitTooltip, DisplayOnScreen: true, }, { - Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook), + Key: opts.GetKey(opts.Config.Files.CommitWithoutHook), Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress, Description: self.c.Tr.CommitChangesWithoutHook, }, @@ -112,7 +112,7 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types Description: self.c.Tr.RefreshFiles, }, |