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

Merge branch 'bc/Feature26738' of https://github.com/BugraC/vscode into BugraC-bc/Feature26738

Browse Source
This commit is contained in:
Joao Moreno
2017-06-26 15:34:26 +02:00
parent 7b90f16e19 39f33ae2ae
commit 14380f9766
5 changed files with 62 additions and 6 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.pullFromRemoteBranch",
"title": "%command.pullFromRemoteBranch%",
"category": "Git"
},
{
"command": "git.push",
"title": "%command.push%",
@@ -321,6 +326,10 @@
"command": "git.pull",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pullFromRemoteBranch",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pullRebase",
"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.pullFromRemoteBranch",
"group": "1_sync",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.push",
"group": "1_sync",