Merge branch 'master', commit 'refs/pull/56048/head' of github.com:Microsoft/vscode into pr/56048

This commit is contained in:
Joao Moreno
2018-09-12 15:37:41 +02:00
5 changed files with 33 additions and 0 deletions

View File

@@ -190,6 +190,11 @@
"title": "%command.commitStaged%",
"category": "Git"
},
{
"command": "git.commitEmpty",
"title": "%command.commitEmpty%",
"category": "Git"
},
{
"command": "git.commitStagedSigned",
"title": "%command.commitStagedSigned%",
@@ -417,6 +422,10 @@
"command": "git.commit",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitEmpty",
"when": "config.git.allowcommitEmptys && gitOpenRepositoryCount != 0"
},
{
"command": "git.commitStaged",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -599,6 +608,11 @@
"group": "3_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitEmpty",
"group": "3_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitStagedSigned",
"group": "3_commit",
@@ -991,6 +1005,12 @@
"description": "%config.enableCommitSigning%",
"default": false
},
"git.allowEmptyCommits": {
"type": "boolean",
"scope": "resource",
"description": "%config.allowEmptyCommits%",
"default": false
},
"git.decorations.enabled": {
"type": "boolean",
"default": true,