Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/54300/head' of github.com:Microsoft/vscode into pr/54300

Browse Source
This commit is contained in:
Joao Moreno
2018-09-13 15:55:04 +02:00
parent 44f8dfb5ce c56219e13d
commit 9c06533ace
5 changed files with 93 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/git/package.json
View File

@@ -339,6 +339,16 @@
"command": "git.stashPopLatest",
"title": "%command.stashPopLatest%",
"category": "Git"
},
{
"command": "git.stashApply",
"title": "%command.stashApply%",
"category": "Git"
},
{
"command": "git.stashApplyLatest",
"title": "%command.stashApplyLatest%",
"category": "Git"
}
],
"menus": {
@@ -550,6 +560,14 @@
{
"command": "git.stashPopLatest",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.stashApply",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.stashApplyLatest",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
}
],
"scm/title": [
@@ -678,6 +696,16 @@
"group": "5_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashApply",
"group": "5_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashApplyLatest",
"group": "5_stash",
"when": "scmProvider == git"
},
{
"command": "git.showOutput",
"group": "7_repository",