Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3wm

Browse Source
This commit is contained in:
Johannes
2022-05-16 09:53:59 +02:00
parent e00030977e c23f0305db
commit 3aac77dc5d
154 changed files with 3916 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
extensions/git/package.json
View File

@@ -461,6 +461,21 @@
"title": "%command.revealInExplorer%",
"category": "Git"
},
{
"command": "git.revealFileInOS.linux",
"title": "%command.revealFileInOS.linux%",
"category": "Git"
},
{
"command": "git.revealFileInOS.mac",
"title": "%command.revealFileInOS.mac%",
"category": "Git"
},
{
"command": "git.revealFileInOS.windows",
"title": "%command.revealFileInOS.windows%",
"category": "Git"
},
{
"command": "git.stashIncludeUntracked",
"title": "%command.stashIncludeUntracked%",
@@ -768,6 +783,18 @@
"command": "git.revealInExplorer",
"when": "false"
},
{
"command": "git.revealFileInOS.linux",
"when": "false"
},
{
"command": "git.revealFileInOS.mac",
"when": "false"
},
{
"command": "git.revealFileInOS.windows",
"when": "false"
},
{
"command": "git.undoCommit",
"when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0"
@@ -1218,7 +1245,22 @@
{
"command": "git.revealInExplorer",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "2_view"
"group": "2_view@1"
},
{
"command": "git.revealFileInOS.linux",
"when": "scmProvider == git && scmResourceGroup == merge && isLinux",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.mac",
"when": "scmProvider == git && scmResourceGroup == merge && isMac",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.windows",
"when": "scmProvider == git && scmResourceGroup == merge && isWindows",
"group": "2_view@2"
},
{
"command": "git.openFile2",
@@ -1258,7 +1300,22 @@
{
"command": "git.revealInExplorer",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "2_view"
"group": "2_view@1"
},
{
"command": "git.revealFileInOS.linux",
"when": "scmProvider == git && scmResourceGroup == index && isLinux",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.mac",
"when": "scmProvider == git && scmResourceGroup == index && isMac",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.windows",
"when": "scmProvider == git && scmResourceGroup == index && isWindows",
"group": "2_view@2"
},
{
"command": "git.openFile2",
@@ -1323,7 +1380,22 @@
{
"command": "git.revealInExplorer",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "2_view"
"group": "2_view@1"
},
{
"command": "git.revealFileInOS.linux",
"when": "scmProvider == git && scmResourceGroup == workingTree && isLinux",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.mac",
"when": "scmProvider == git && scmResourceGroup == workingTree && isMac",
"group": "2_view@2"
},
{
"command": "git.revealFileInOS.windows",
"when": "scmProvider == git && scmResourceGroup == workingTree && isWindows",
"group": "2_view@2"
},
{
"command": "git.openChange",
@@ -1795,6 +1867,29 @@
"description": "%config.branchPrefix%",
"default": ""
},
"git.branchProtection": {
"type": "array",
"markdownDescription": "%config.branchProtection%",
"items": {
"type": "string"
},
"default": []
},
"git.branchProtectionPrompt": {
"type": "string",
"description": "%config.branchProtectionPrompt%",
"enum": [
"alwaysCommit",
"alwaysCommitToNewBranch",
"alwaysPrompt"
],
"enumDescriptions": [
"%config.branchProtectionPrompt.alwaysCommit%",
"%config.branchProtectionPrompt.alwaysCommitToNewBranch%",
"%config.branchProtectionPrompt.alwaysPrompt%"
],
"default": "alwaysPrompt"
},
"git.branchValidationRegex": {
"type": "string",
"description": "%config.branchValidationRegex%",
@@ -2543,6 +2638,7 @@
"byline": "^5.0.0",
"file-type": "^7.2.0",
"jschardet": "3.0.0",
"picomatch": "2.3.1",
"vscode-nls": "^4.0.0",
"vscode-uri": "^2.0.0",
"which": "^1.3.0"
@@ -2552,6 +2648,7 @@
"@types/file-type": "^5.2.1",
"@types/mocha": "^9.1.1",
"@types/node": "16.x",
"@types/picomatch": "2.3.0",
"@types/which": "^1.0.28"
},
"repository": {