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 '31055-Sync-Rebase' of https://github.com/excerebrose/vscode into excerebrose-31055-Sync-Rebase

Browse Source
This commit is contained in:
Joao Moreno
2017-11-08 12:20:10 +01:00
parent 0e45891c40 3085d3ebd7
commit 07885099aa
4 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/git/package.json
View File

@@ -264,6 +264,11 @@
"title": "%command.sync%",
"category": "Git"
},
{
"command": "git.syncRebase",
"title": "%command.syncRebase%",
"category": "Git"
},
{
"command": "git.publish",
"title": "%command.publish%",
@@ -449,6 +454,10 @@
"command": "git.sync",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
},
{
"command": "git.syncRebase",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.publish",
"when": "config.git.enabled && gitOpenRepositoryCount != 0"
@@ -495,6 +504,11 @@
"group": "1_sync",
"when": "config.git.enabled && scmProvider == git"
},
{
"command": "git.syncRebase",
"group": "1_sync",
"when": "config.git.enabled && scmProvider == git && gitState == idle"
},
{
"command": "git.pull",
"group": "1_sync",