Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-28 13:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - move commit/cancel actions from editor/title to editor/content (#283020)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-12-12 12:19:25 +00:00
committed by GitHub
parent b15219fdc0
commit 276db4812e
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/git/package.json
View File

@@ -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": [

4
extensions/git/package.nls.json
View File

@@ -60,8 +60,8 @@
"command.commitAllNoVerify": "Commit All (No Verify)",
"command.commitAllSignedNoVerify": "Commit All (Signed Off, No Verify)",
"command.commitAllAmendNoVerify": "Commit All (Amend, No Verify)",
"command.commitMessageAccept": "Accept Commit Message",
"command.commitMessageDiscard": "Discard Commit Message",
"command.commitMessageAccept": "Commit",
"command.commitMessageDiscard": "Cancel",
"command.restoreCommitTemplate": "Restore Commit Template",
"command.undoCommit": "Undo Last Commit",
"command.checkout": "Checkout to...",