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 branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master

Browse Source
This commit is contained in:
Joao Moreno
2017-06-26 15:36:00 +02:00
parent 7b90f16e19 42ab4c41a4
commit 53ce1b0b46
5 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/git/package.json
View File

@@ -192,6 +192,11 @@
"title": "%command.pullRebase%",
"category": "Git"
},
{
"command": "git.pullFrom",
"title": "%command.pullFrom%",
"category": "Git"
},
{
"command": "git.push",
"title": "%command.push%",
@@ -325,6 +330,10 @@
"command": "git.pullRebase",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pullFrom",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.push",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
@@ -377,6 +386,11 @@
"group": "1_sync",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pullFrom",
"group": "1_sync",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.push",
"group": "1_sync",