git: merge actions

This commit is contained in:
Joao Moreno
2017-01-11 12:10:48 +01:00
parent 6ea8b8242d
commit 2e4395c11e

View File

@@ -104,6 +104,16 @@
}
],
"scm/resourceGroup/context": [
{
"command": "git.stageAll",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "1_modification"
},
{
"command": "git.stageAll",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
},
{
"command": "git.unstageAll",
"when": "scmProvider == git && scmResourceGroup == index",
@@ -136,6 +146,16 @@
}
],
"scm/resource/context": [
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "1_modification"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == index",