maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix https://github.com/microsoft/vscode/issues/117456

Browse source
This commit is contained in:
Johannes Rieken 2021-02-24 15:00:06 +01:00
parent e7150f1fd3
commit a799375663
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
extensions/git/package.json
View file

@ -982,7 +982,7 @@
{
"command": "git.stageAllMerge",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.unstageAll",
@ -992,7 +992,7 @@
{
"command": "git.unstageAll",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.cleanAll",
@ -1007,12 +1007,12 @@
{
"command": "git.cleanAll",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges == mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stageAll",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges == mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.cleanAllTracked",
@ -1027,12 +1027,12 @@
{
"command": "git.cleanAllTracked",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges != mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stageAllTracked",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.untrackedChanges != mixed",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.cleanAllUntracked",
@ -1047,12 +1047,12 @@
{
"command": "git.cleanAllUntracked",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stageAllUntracked",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
}
],
"scm/resourceFolder/context": [
@ -1064,7 +1064,7 @@
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.unstage",
@ -1074,7 +1074,7 @@
{
"command": "git.unstage",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
@ -1089,12 +1089,12 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.ignore",
@ -1109,7 +1109,7 @@
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.clean",
@ -1119,7 +1119,7 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.ignore",
@ -1141,7 +1141,7 @@
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == merge",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.revealInExplorer",
@ -1151,12 +1151,12 @@
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
@ -1181,7 +1181,7 @@
{
"command": "git.unstage",
"when": "scmProvider == git && scmResourceGroup == index",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.revealInExplorer",
@ -1191,12 +1191,12 @@
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
@ -1226,22 +1226,22 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == workingTree",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.ignore",
@ -1281,22 +1281,22 @@
{
"command": "git.clean",
"when": "scmProvider == git && scmResourceGroup == untracked && !gitFreshRepository",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.stage",
"when": "scmProvider == git && scmResourceGroup == untracked",
"group": "inline"
"group": "inline@2"
},
{
"command": "git.openFile2",
"when": "scmProvider == git && scmResourceGroup == untracked && config.git.showInlineOpenFileAction && config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.openChange",
"when": "scmProvider == git && scmResourceGroup == untracked && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick",
"group": "inline0"
"group": "inline@1"
},
{
"command": "git.ignore",