mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-22 17:48:56 +01:00
Git - move commit/cancel actions from editor/title to editor/content (#283020)
This commit is contained in:
@@ -448,13 +448,12 @@
|
||||
{
|
||||
"command": "git.commitMessageAccept",
|
||||
"title": "%command.commitMessageAccept%",
|
||||
"icon": "$(check)",
|
||||
"category": "Git"
|
||||
},
|
||||
{
|
||||
"command": "git.commitMessageDiscard",
|
||||
"title": "%command.commitMessageDiscard%",
|
||||
"icon": "$(discard)",
|
||||
"icon": "$(close)",
|
||||
"category": "Git"
|
||||
},
|
||||
{
|
||||
@@ -2584,16 +2583,6 @@
|
||||
"group": "navigation@2",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
|
||||
},
|
||||
{
|
||||
"command": "git.commitMessageAccept",
|
||||
"group": "navigation",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
|
||||
},
|
||||
{
|
||||
"command": "git.commitMessageDiscard",
|
||||
"group": "navigation",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
|
||||
},
|
||||
{
|
||||
"command": "git.stashApplyEditor",
|
||||
"alt": "git.stashPopEditor",
|
||||
@@ -2667,6 +2656,16 @@
|
||||
"command": "git.openMergeEditor",
|
||||
"group": "navigation@-10",
|
||||
"when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
|
||||
},
|
||||
{
|
||||
"command": "git.commitMessageAccept",
|
||||
"group": "navigation",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
|
||||
},
|
||||
{
|
||||
"command": "git.commitMessageDiscard",
|
||||
"group": "secondary",
|
||||
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
|
||||
}
|
||||
],
|
||||
"multiDiffEditor/resource/title": [
|
||||
|
||||
Reference in New Issue
Block a user