Rework git vsc shortcuts

This commit is contained in:
Wilfried OLLIVIER 2022-05-04 07:37:53 +02:00
parent 1e8ba7eabf
commit 0f37ab4b31

View file

@ -130,17 +130,6 @@
"command": "-editor.action.showHover", "command": "-editor.action.showHover",
"when": "editorTextFocus" "when": "editorTextFocus"
}, },
// Diff navigation
{
"key": "ctrl+d n",
"command": "workbench.action.compareEditor.nextChange",
"when": "textCompareEditorVisible"
},
{
"key": "ctrl+d p",
"command": "workbench.action.compareEditor.previousChange",
"when": "textCompareEditorVisible"
},
// Error navigation // Error navigation
{ {
"key": "ctrl+e n", "key": "ctrl+e n",
@ -177,6 +166,11 @@
"command": "-extension.vim_ctrl+o", "command": "-extension.vim_ctrl+o",
"when": "editorTextFocus && vim.active && vim.use<C-o> && !inDebugRepl" "when": "editorTextFocus && vim.active && vim.use<C-o> && !inDebugRepl"
}, },
{
"key": "shift+alt+[Period]",
"command": "-gitlens.gitCommands",
"when": "!gitlens:disabled && config.gitlens.keymap == 'alternate'"
},
// Notifications // Notifications
{ {
"key": "ctrl+y ;", "key": "ctrl+y ;",
@ -219,36 +213,40 @@
}, },
// Git // Git
{ {
"key": "ctrl+g s", "key": "cmd+g cmd+c",
"command": "git.stage" "command": "workbench.action.addComment"
}, },
{ {
"key": "ctrl+g u", "key": "shift+cmd+g",
"command": "git.unstage" "command": "pr:github.focus"
}, },
{ {
"key": "ctrl+g s", "key": "ctrl+g n",
"command": "git.stageSelectedRanges", "command": "workbench.action.compareEditor.nextChange",
"when": "isInDiffEditor"
}, },
{ {
"key": "ctrl+g u", "key": "ctrl+g n",
"command": "git.unstageSelectedRanges", "command": "workbench.action.editor.nextChange",
"when": "isInDiffEditor"
}, },
{ {
"key": "ctrl+g o", "key": "ctrl+g n",
"command": "git.openChange" "command": "workbench.action.editor.nextChange",
"when": "editorTextFocus && !textCompareEditorActive"
}, },
{ {
"key": "ctrl+k ctrl+alt+s", "key": "ctrl+g p",
"command": "-git.stageSelectedRanges", "command": "workbench.action.editor.previousChange",
"when": "isInDiffEditor" "when": "editorTextFocus && !textCompareEditorActive"
}, },
{ {
"key": "ctrl+k ctrl+u", "key": "ctrl+g n",
"command": "-git.unstageSelectedRanges", "command": "workbench.action.compareEditor.nextChange",
"when": "isInDiffEditor" "when": "textCompareEditorVisible"
},
{
"key": "ctrl+g p",
"command": "workbench.action.compareEditor.previousChange",
"when": "textCompareEditorVisible"
}, },
// Magit // Magit
{ {
@ -285,15 +283,6 @@
"key": "ctrl+[BracketRight]", "key": "ctrl+[BracketRight]",
"command": "magit.process-log" "command": "magit.process-log"
}, },
// Git
{
"key": "cmd+g cmd+c",
"command": "workbench.action.addComment"
},
{
"key": "shift+cmd+g",
"command": "pr:github.focus"
},
// Magit resets // Magit resets
{ {
"key": "k", "key": "k",