Merge from vscode ec07311dab2556c9d66a4cb3eecdc21c524202e1 (#6739)

2026-02-16 10:58:30 -05:00 · 2019-08-13 19:14:03 -07:00
parent a645a09f42
commit 82c1c57c76
77 changed files with 1319 additions and 741 deletions
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1354,6 +1354,15 @@
          "scope": "resource",
          "default": false,
          "description": "%config.supportCancellation%"
+        },
+        "git.branchSortOrder": {
+          "type": "string",
+          "enum": [
+            "committerdate",
+            "alphabetically"
+          ],
+          "default": "committerdate",
+          "description": "%config.branchSortOrder%"
        }
      }
    },