Merge from vscode 966b87dd4013be1a9c06e2b8334522ec61905cc2 (#4696)

This commit is contained in:
Anthony Dresser
2019-03-26 11:43:38 -07:00
committed by GitHub
parent b1393ae615
commit 0d8ef9583b
268 changed files with 5947 additions and 3422 deletions

View File

@@ -703,89 +703,94 @@
"group": "1_sync",
"when": "scmProvider == git && config.git.allowForcePush"
},
{
"command": "git.checkout",
"group": "2_branch",
"when": "scmProvider == git"
},
{
"command": "git.publish",
"group": "2_publish",
"group": "2_branch",
"when": "scmProvider == git"
},
{
"command": "git.commitStaged",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitStagedSigned",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitStagedAmend",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitAll",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitAllSigned",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.commitAllAmend",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.undoCommit",
"group": "3_commit",
"group": "4_commit",
"when": "scmProvider == git"
},
{
"command": "git.stageAll",
"group": "4_stage",
"group": "5_stage",
"when": "scmProvider == git"
},
{
"command": "git.unstageAll",
"group": "4_stage",
"group": "5_stage",
"when": "scmProvider == git"
},
{
"command": "git.cleanAll",
"group": "4_stage",
"group": "5_stage",
"when": "scmProvider == git && !gitFreshRepository"
},
{
"command": "git.stashIncludeUntracked",
"group": "5_stash",
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.stash",
"group": "5_stash",
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashPop",
"group": "5_stash",
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashPopLatest",
"group": "5_stash",
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashApply",
"group": "5_stash",
"group": "6_stash",
"when": "scmProvider == git"
},
{
"command": "git.stashApplyLatest",
"group": "5_stash",
"group": "6_stash",
"when": "scmProvider == git"
},
{