Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

git.pullFrom

Browse Source 
octopus commit
This commit is contained in:
Joao Moreno
2017-06-26 15:42:53 +02:00
parent 14380f9766 53ce1b0b46 5f31035e46
commit 417cdb62b7
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/git/package.json
View File

@@ -193,8 +193,8 @@
"category": "Git"
},
{
"command": "git.pullFromRemoteBranch",
"title": "%command.pullFromRemoteBranch%",
"command": "git.pullFrom",
"title": "%command.pullFrom%",
"category": "Git"
},
{
@@ -327,13 +327,17 @@
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pullFromRemoteBranch",
"command": "git.pullFrom",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"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"
@@ -387,8 +391,7 @@
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pullFromRemoteBranch",
"group": "1_sync",
"command": "git.pullFrom",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{