Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342

This commit is contained in:
Joao Moreno
2019-10-25 11:32:15 +02:00
5 changed files with 49 additions and 0 deletions

View File

@@ -401,6 +401,11 @@
"command": "git.stashApplyLatest",
"title": "%command.stashApplyLatest%",
"category": "Git"
},
{
"command": "git.stashDrop",
"title": "%command.stashDrop%",
"category": "Git"
}
],
"menus": {
@@ -660,6 +665,10 @@
{
"command": "git.stashApplyLatest",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.stashDrop",
"when": "config.get.enabled && gitOpenRepositoryCount != 0"
}
],
"scm/title": [
@@ -813,6 +822,11 @@
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashDrop",
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.showOutput",
"group": "7_repository",