From 276db4812ebdca9d7df54d7997d0b97ea5b01657 Mon Sep 17 00:00:00 2001
From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
Date: Fri, 12 Dec 2025 12:19:25 +0000
Subject: [PATCH] Git - move commit/cancel actions from editor/title to
 editor/content (#283020)

---
 extensions/git/package.json     | 23 +++++++++++------------
 extensions/git/package.nls.json |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 865aca228b6..acda1837a38 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -448,13 +448,12 @@
       {
         "command": "git.commitMessageAccept",
         "title": "%command.commitMessageAccept%",
-        "icon": "$(check)",
         "category": "Git"
       },
       {
         "command": "git.commitMessageDiscard",
         "title": "%command.commitMessageDiscard%",
-        "icon": "$(discard)",
+        "icon": "$(close)",
         "category": "Git"
       },
       {
@@ -2584,16 +2583,6 @@
           "group": "navigation@2",
           "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && !isInDiffEditor && !isMergeEditor && resourceScheme == file && scmActiveResourceHasChanges"
         },
-        {
-          "command": "git.commitMessageAccept",
-          "group": "navigation",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
-        },
-        {
-          "command": "git.commitMessageDiscard",
-          "group": "navigation",
-          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
-        },
         {
           "command": "git.stashApplyEditor",
           "alt": "git.stashPopEditor",
@@ -2667,6 +2656,16 @@
           "command": "git.openMergeEditor",
           "group": "navigation@-10",
           "when": "config.git.enabled && !git.missing && !isInDiffEditor && !isMergeEditor && resource in git.mergeChanges && git.activeResourceHasMergeConflicts"
+        },
+        {
+          "command": "git.commitMessageAccept",
+          "group": "navigation",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
+        },
+        {
+          "command": "git.commitMessageDiscard",
+          "group": "secondary",
+          "when": "config.git.enabled && !git.missing && gitOpenRepositoryCount != 0 && editorLangId == git-commit"
         }
       ],
       "multiDiffEditor/resource/title": [
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index b21676419fa..385fce3172a 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -60,8 +60,8 @@
 	"command.commitAllNoVerify": "Commit All (No Verify)",
 	"command.commitAllSignedNoVerify": "Commit All (Signed Off, No Verify)",
 	"command.commitAllAmendNoVerify": "Commit All (Amend, No Verify)",
-	"command.commitMessageAccept": "Accept Commit Message",
-	"command.commitMessageDiscard": "Discard Commit Message",
+	"command.commitMessageAccept": "Commit",
+	"command.commitMessageDiscard": "Cancel",
 	"command.restoreCommitTemplate": "Restore Commit Template",
 	"command.undoCommit": "Undo Last Commit",
 	"command.checkout": "Checkout to...",