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

Add "pullFrom" git command

Browse Source 
Resolves Microsoft/vscode#26738
This commit is contained in:
Matt Shirley
2017-05-20 00:10:04 -07:00
parent 4ba9130583
commit 42ab4c41a4
5 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/git/package.json
View File

@@ -182,6 +182,11 @@
"title": "%command.pullRebase%",
"category": "Git"
},
{
"command": "git.pullFrom",
"title": "%command.pullFrom%",
"category": "Git"
},
{
"command": "git.push",
"title": "%command.push%",
@@ -306,6 +311,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"
@@ -358,6 +367,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",