Merge VS Code 1.31.1 (#4283)

This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions

View File

@@ -661,11 +661,21 @@
"group": "1_sync",
"when": "scmProvider == git"
},
{
"command": "git.pushForce",
"group": "1_sync",
"when": "scmProvider == git && config.git.allowForcePush"
},
{
"command": "git.pushTo",
"group": "1_sync",
"when": "scmProvider == git"
},
{
"command": "git.pushToForce",
"group": "1_sync",
"when": "scmProvider == git && config.git.allowForcePush"
},
{
"command": "git.publish",
"group": "2_publish",
@@ -1018,12 +1028,19 @@
},
"git.autofetch": {
"type": "boolean",
"scope": "resource",
"description": "%config.autofetch%",
"default": false,
"tags": [
"usesOnlineServices"
]
},
"git.autofetchPeriod": {
"type": "number",
"scope": "resource",
"description": "%config.autofetchPeriod%",
"default": 180
},
"git.branchValidationRegex": {
"type": "string",
"description": "%config.branchValidationRegex%",
@@ -1160,6 +1177,14 @@
"default": 72,
"description": "%config.inputValidationLength%"
},
"git.inputValidationSubjectLength": {
"type": [
"number",
"null"
],
"default": null,
"description": "%config.inputValidationSubjectLength%"
},
"git.detectSubmodules": {
"type": "boolean",
"scope": "resource",
@@ -1214,6 +1239,12 @@
"default": false,
"description": "%config.fetchOnPull%"
},
"git.autoStash": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.autoStash%"
},
"git.allowForcePush": {
"type": "boolean",
"default": false,
@@ -1231,6 +1262,7 @@
},
"git.openDiffOnClick": {
"type": "boolean",
"scope": "resource",
"default": true,
"description": "%config.openDiffOnClick%"
}
@@ -1385,7 +1417,7 @@
"file-type": "^7.2.0",
"iconv-lite": "^0.4.24",
"jschardet": "^1.6.0",
"vscode-extension-telemetry": "0.1.0",
"vscode-extension-telemetry": "0.1.1",
"vscode-nls": "^4.0.0",
"which": "^1.3.0"
},