fixes #102109

extensions/git/package.json

@@ -753,149 +753,49 @@
           "group": "navigation",
           "when": "scmProvider == git"
         },
-        {
-          "command": "git.sync",
-          "group": "1_sync",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.syncRebase",
-          "group": "1_sync",
-          "when": "scmProvider == git && gitState == idle"
-        },
-        {
-          "command": "git.pull",
-          "group": "1_sync",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.pullRebase",
-          "group": "1_sync",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.pullFrom",
-          "group": "1_sync",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.push",
-          "group": "1_sync",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.pushForce",
-          "group": "1_sync",
-          "when": "scmProvider == git && config.git.allowForcePush"
-        },
-        {
-          "command": "git.pushTo",
-          "group": "1_sync",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.pushToForce",
-          "group": "1_sync",
-          "when": "scmProvider == git && config.git.allowForcePush"
-        },
         {
           "command": "git.checkout",
-          "group": "2_branch",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.publish",
-          "group": "2_branch",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.commitStaged",
-          "group": "4_commit",
+          "group": "1_header",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.commitStagedSigned",
-          "group": "4_commit",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.commitStagedAmend",
-          "group": "4_commit",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.commitAll",
-          "group": "4_commit",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.commitAllSigned",
-          "group": "4_commit",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.commitAllAmend",
-          "group": "4_commit",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.undoCommit",
-          "group": "4_commit",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.stageAll",
-          "group": "5_stage",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.unstageAll",
-          "group": "5_stage",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.cleanAll",
-          "group": "5_stage",
-          "when": "scmProvider == git"
-        },
-        {
-          "command": "git.stashIncludeUntracked",
-          "group": "6_stash",
+          "command": "git.clone",
+          "group": "1_header",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.stash",
-          "group": "6_stash",
+          "submenu": "git.commit",
+          "group": "2_main@1",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.stashPop",
-          "group": "6_stash",
+          "submenu": "git.changes",
+          "group": "2_main@2",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.stashPopLatest",
-          "group": "6_stash",
+          "submenu": "git.pullpush",
+          "group": "2_main@3",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.stashApply",
-          "group": "6_stash",
+          "submenu": "git.branch",
+          "group": "2_main@4",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.stashApplyLatest",
-          "group": "6_stash",
+          "submenu": "git.remotes",
+          "group": "2_main@5",
           "when": "scmProvider == git"
         },
         {
-          "command": "git.stashDrop",
-          "group": "6_stash",
+          "submenu": "git.stash",
+          "group": "2_main@6",
           "when": "scmProvider == git"
         },
         {
           "command": "git.showOutput",
-          "group": "7_repository",
+          "group": "3_footer",
           "when": "scmProvider == git"
         }
       ],
@@ -1307,8 +1207,200 @@
           "group": "5_copy@2",
           "when": "config.git.enabled && !git.missing && timelineItem =~ /git:file:commit\\b/"
         }
+      ],
+      "git.commit": [
+        {
+          "command": "git.commit",
+          "group": "main@1"
+        },
+        {
+          "command": "git.commitStaged",
+          "group": "main@2"
+        },
+        {
+          "command": "git.commitAll",
+          "group": "main@3"
+        },
+        {
+          "command": "git.undoCommit",
+          "group": "main@4"
+        },
+        {
+          "command": "git.rebaseAbort",
+          "group": "main@5"
+        },
+        {
+          "submenu": "git.commit.amend",
+          "group": "main@6"
+        },
+        {
+          "submenu": "git.commit.signoff",
+          "group": "main@7"
+        }
+      ],
+      "git.commit.amend": [
+        {
+          "command": "git.commitStagedAmend"
+        },
+        {
+          "command": "git.commitAllAmend"
+        }
+      ],
+      "git.commit.signoff": [
+        {
+          "command": "git.commitStagedSigned"
+        },
+        {
+          "command": "git.commitAllSigned"
+        }
+      ],
+      "git.changes": [
+        {
+          "command": "git.stageAll"
+        },
+        {
+          "command": "git.unstageAll"
+        },
+        {
+          "command": "git.cleanAll"
+        }
+      ],
+      "git.pullpush": [
+        {
+          "command": "git.fetch",
+          "group": "1_fetch"
+        },
+        {
+          "command": "git.fetchPrune",
+          "group": "1_fetch"
+        },
+        {
+          "command": "git.fetchAll",
+          "group": "1_fetch"
+        },
+        {
+          "command": "git.sync",
+          "group": "2_sync"
+        },
+        {
+          "command": "git.syncRebase",
+          "when": "gitState == idle",
+          "group": "2_sync"
+        },
+        {
+          "command": "git.pull",
+          "group": "3_pull"
+        },
+        {
+          "command": "git.pullRebase",
+          "group": "3_pull"
+        },
+        {
+          "command": "git.pullFrom",
+          "group": "3_pull"
+        },
+        {
+          "command": "git.push",
+          "group": "4_push"
+        },
+        {
+          "command": "git.pushForce",
+          "when": "config.git.allowForcePush",
+          "group": "4_push"
+        },
+        {
+          "command": "git.pushTo",
+          "group": "4_push"
+        },
+        {
+          "command": "git.pushToForce",
+          "when": "config.git.allowForcePush",
+          "group": "4_push"
+        }
+      ],
+      "git.branch": [
+        {
+          "command": "git.merge"
+        },
+        {
+          "command": "git.branch"
+        },
+        {
+          "command": "git.branchFrom"
+        },
+        {
+          "command": "git.renameBranch"
+        },
+        {
+          "command": "git.publish"
+        }
+      ],
+      "git.remotes": [
+        {
+          "command": "git.addRemote"
+        },
+        {
+          "command": "git.removeRemote"
+        }
+      ],
+      "git.stash": [
+        {
+          "command": "git.stash"
+        },
+        {
+          "command": "git.stashIncludeUntracked"
+        },
+        {
+          "command": "git.stashApplyLatest"
+        },
+        {
+          "command": "git.stashApply"
+        },
+        {
+          "command": "git.stashPopLatest"
+        },
+        {
+          "command": "git.stashPop"
+        },
+        {
+          "command": "git.stashDrop"
+        }
       ]
     },
+    "submenus": [
+      {
+        "id": "git.commit",
+        "label": "%submenu.commit%"
+      },
+      {
+        "id": "git.commit.amend",
+        "label": "%submenu.commit.amend%"
+      },
+      {
+        "id": "git.commit.signoff",
+        "label": "%submenu.commit.signoff%"
+      },
+      {
+        "id": "git.changes",
+        "label": "%submenu.changes%"
+      },
+      {
+        "id": "git.pullpush",
+        "label": "%submenu.pullpush%"
+      },
+      {
+        "id": "git.branch",
+        "label": "%submenu.branch%"
+      },
+      {
+        "id": "git.remotes",
+        "label": "%submenu.remotes%"
+      },
+      {
+        "id": "git.stash",
+        "label": "%submenu.stash%"
+      }
+    ],
     "configuration": {
       "title": "Git",
       "properties": {

extensions/git/package.nls.json

@@ -147,6 +147,14 @@
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for git processes spawned in the integrated terminal. Note: terminals need to be restarted to pick up a change in this setting.",
+	"submenu.commit": "Commit",
+	"submenu.commit.amend": "Amend",
+	"submenu.commit.signoff": "Sign Off",
+	"submenu.changes": "Changes",
+	"submenu.pullpush": "Pull, Push",
+	"submenu.branch": "Branch",
+	"submenu.remotes": "Remote",
+	"submenu.stash": "Stash",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",