From f50ee04ed90f829d6d81e6f0479dcf9a5efc0a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Moreno?= <joao.moreno@microsoft.com>
Date: Mon, 26 Oct 2020 15:06:35 +0100
Subject: [PATCH] fix git submenus order

fixes #109286
---
 extensions/git/package.json | 82 ++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index a254c18aa16..c9430e7c648 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1394,127 +1394,145 @@
       ],
       "git.changes": [
         {
-          "command": "git.stageAll"
+          "command": "git.stageAll",
+          "group": "changes@1"
         },
         {
-          "command": "git.unstageAll"
+          "command": "git.unstageAll",
+          "group": "changes@2"
         },
         {
-          "command": "git.cleanAll"
+          "command": "git.cleanAll",
+          "group": "changes@3"
         }
       ],
       "git.pullpush": [
         {
           "command": "git.sync",
-          "group": "1_sync"
+          "group": "1_sync@1"
         },
         {
           "command": "git.syncRebase",
           "when": "gitState == idle",
-          "group": "1_sync"
+          "group": "1_sync@2"
         },
         {
           "command": "git.pull",
-          "group": "2_pull"
+          "group": "2_pull@1"
         },
         {
           "command": "git.pullRebase",
-          "group": "2_pull"
+          "group": "2_pull@2"
         },
         {
           "command": "git.pullFrom",
-          "group": "2_pull"
+          "group": "2_pull@3"
         },
         {
           "command": "git.push",
-          "group": "3_push"
+          "group": "3_push@1"
         },
         {
           "command": "git.pushForce",
           "when": "config.git.allowForcePush",
-          "group": "3_push"
+          "group": "3_push@2"
         },
         {
           "command": "git.pushTo",
-          "group": "3_push"
+          "group": "3_push@3"
         },
         {
           "command": "git.pushToForce",
           "when": "config.git.allowForcePush",
-          "group": "3_push"
+          "group": "3_push@4"
         },
         {
           "command": "git.fetch",
-          "group": "4_fetch"
+          "group": "4_fetch@1"
         },
         {
           "command": "git.fetchPrune",
-          "group": "4_fetch"
+          "group": "4_fetch@2"
         },
         {
           "command": "git.fetchAll",
-          "group": "4_fetch"
+          "group": "4_fetch@3"
         }
       ],
       "git.branch": [
         {
-          "command": "git.merge"
+          "command": "git.merge",
+          "group": "branch@1"
         },
         {
-          "command": "git.rebase"
+          "command": "git.rebase",
+          "group": "branch@2"
         },
         {
-          "command": "git.branch"
+          "command": "git.branch",
+          "group": "branch@3"
         },
         {
-          "command": "git.branchFrom"
+          "command": "git.branchFrom",
+          "group": "branch@4"
         },
         {
-          "command": "git.renameBranch"
+          "command": "git.renameBranch",
+          "group": "branch@5"
         },
         {
-          "command": "git.publish"
+          "command": "git.publish",
+          "group": "branch@6"
         }
       ],
       "git.remotes": [
         {
-          "command": "git.addRemote"
+          "command": "git.addRemote",
+          "group": "remote@1"
         },
         {
-          "command": "git.removeRemote"
+          "command": "git.removeRemote",
+          "group": "remote@2"
         }
       ],
       "git.stash": [
         {
-          "command": "git.stash"
+          "command": "git.stash",
+          "group": "stash@1"
         },
         {
-          "command": "git.stashIncludeUntracked"
+          "command": "git.stashIncludeUntracked",
+          "group": "stash@2"
         },
         {
-          "command": "git.stashApplyLatest"
+          "command": "git.stashApplyLatest",
+          "group": "stash@3"
         },
         {
-          "command": "git.stashApply"
+          "command": "git.stashApply",
+          "group": "stash@4"
         },
         {
-          "command": "git.stashPopLatest"
+          "command": "git.stashPopLatest",
+          "group": "stash@5"
         },
         {
-          "command": "git.stashPop"
+          "command": "git.stashPop",
+          "group": "stash@6"
         },
         {
-          "command": "git.stashDrop"
+          "command": "git.stashDrop",
+          "group": "stash@7"
         }
       ],
       "git.tags": [
         {
           "command": "git.createTag",
-          "group": "1_tags@1"
+          "group": "tags@1"
         },
         {
           "command": "git.deleteTag",
-          "group": "1_tags@2"
+          "group": "tags@2"
         }
       ]
     },
-- 
GitLab