diff --git a/GitUI/CommandsDialogs/FormCommit.Designer.cs b/GitUI/CommandsDialogs/FormCommit.Designer.cs
index cbdb7c1a95a..8345f924a8c 100644
--- a/GitUI/CommandsDialogs/FormCommit.Designer.cs
+++ b/GitUI/CommandsDialogs/FormCommit.Designer.cs
@@ -382,7 +382,7 @@ private void InitializeComponent()
this.StageInSuperproject.Margin = new System.Windows.Forms.Padding(0, 9, 0, 3);
this.StageInSuperproject.Name = "StageInSuperproject";
this.StageInSuperproject.Size = new System.Drawing.Size(130, 17);
- this.StageInSuperproject.TabIndex = 13;
+ this.StageInSuperproject.TabIndex = 103;
this.StageInSuperproject.Text = "Stage &in Superproject";
this.fileTooltip.SetToolTip(this.StageInSuperproject, "Stage current submodule in superproject after commit");
this.StageInSuperproject.UseVisualStyleBackColor = true;
@@ -1126,7 +1126,7 @@ private void InitializeComponent()
this.flowCommitButtons.Name = "flowCommitButtons";
this.tableLayoutPanel1.SetRowSpan(this.flowCommitButtons, 2);
this.flowCommitButtons.Size = new System.Drawing.Size(171, 192);
- this.flowCommitButtons.TabIndex = 1;
+ this.flowCommitButtons.TabIndex = 100;
this.flowCommitButtons.WrapContents = false;
//
// Commit
@@ -1137,8 +1137,7 @@ private void InitializeComponent()
this.Commit.Margin = new System.Windows.Forms.Padding(0, 0, 0, 3);
this.Commit.Name = "Commit";
this.Commit.Size = new System.Drawing.Size(171, 26);
- this.Commit.TabIndex = 1;
- this.Commit.TabStop = false;
+ this.Commit.TabIndex = 101;
this.Commit.Text = "&Commit";
this.Commit.UseVisualStyleBackColor = true;
this.Commit.Click += new System.EventHandler(this.CommitClick);
@@ -1151,8 +1150,7 @@ private void InitializeComponent()
this.CommitAndPush.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.CommitAndPush.Name = "CommitAndPush";
this.CommitAndPush.Size = new System.Drawing.Size(171, 26);
- this.CommitAndPush.TabIndex = 9;
- this.CommitAndPush.TabStop = false;
+ this.CommitAndPush.TabIndex = 102;
this.CommitAndPush.UseVisualStyleBackColor = true;
this.CommitAndPush.Click += new System.EventHandler(this.CommitAndPush_Click);
//
@@ -1163,8 +1161,8 @@ private void InitializeComponent()
this.Amend.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.Amend.Name = "Amend";
this.Amend.Size = new System.Drawing.Size(97, 17);
- this.Amend.TabIndex = 0;
- this.Amend.Text = "&Amend Commit";
+ this.Amend.TabIndex = 104;
+ this.Amend.Text = "&Amend commit";
this.Amend.UseVisualStyleBackColor = true;
this.Amend.CheckedChanged += new System.EventHandler(this.Amend_CheckedChanged);
//
@@ -1175,8 +1173,8 @@ private void InitializeComponent()
this.ResetAuthor.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.ResetAuthor.Name = "ResetAuthor";
this.ResetAuthor.Size = new System.Drawing.Size(97, 17);
- this.ResetAuthor.TabIndex = 0;
- this.ResetAuthor.Text = "R&eset Author";
+ this.ResetAuthor.TabIndex = 105;
+ this.ResetAuthor.Text = "R&eset author";
this.ResetAuthor.UseVisualStyleBackColor = true;
this.ResetAuthor.Visible = false;
//
@@ -1188,9 +1186,8 @@ private void InitializeComponent()
this.StashStaged.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.StashStaged.Name = "StashStaged";
this.StashStaged.Size = new System.Drawing.Size(171, 26);
- this.StashStaged.TabIndex = 14;
- this.StashStaged.TabStop = false;
- this.StashStaged.Text = "S&tash staged changes";
+ this.StashStaged.TabIndex = 107;
+ this.StashStaged.Text = "Stas&h staged changes";
this.StashStaged.UseVisualStyleBackColor = true;
this.StashStaged.Click += new System.EventHandler(this.StashStagedClick);
//
@@ -1202,8 +1199,7 @@ private void InitializeComponent()
this.Reset.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.Reset.Name = "Reset";
this.Reset.Size = new System.Drawing.Size(171, 26);
- this.Reset.TabIndex = 11;
- this.Reset.TabStop = false;
+ this.Reset.TabIndex = 108;
this.Reset.Text = "&Reset all changes";
this.Reset.UseVisualStyleBackColor = true;
this.Reset.Click += new System.EventHandler(this.ResetClick);
@@ -1216,8 +1212,7 @@ private void InitializeComponent()
this.ResetUnStaged.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.ResetUnStaged.Name = "ResetUnStaged";
this.ResetUnStaged.Size = new System.Drawing.Size(171, 26);
- this.ResetUnStaged.TabIndex = 14;
- this.ResetUnStaged.TabStop = false;
+ this.ResetUnStaged.TabIndex = 109;
this.ResetUnStaged.Text = "Reset u&nstaged changes";
this.ResetUnStaged.UseVisualStyleBackColor = true;
this.ResetUnStaged.Click += new System.EventHandler(this.ResetUnStagedClick);
@@ -1240,7 +1235,7 @@ private void InitializeComponent()
this.toolbarCommit.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
this.toolbarCommit.Size = new System.Drawing.Size(340, 28);
this.toolbarCommit.Stretch = true;
- this.toolbarCommit.TabIndex = 5;
+ this.toolbarCommit.TabIndex = 110;
//
// commitMessageToolStripMenuItem
//
diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs
index e5b01ac7949..4386dff6bda 100644
--- a/GitUI/CommandsDialogs/FormCommit.cs
+++ b/GitUI/CommandsDialogs/FormCommit.cs
@@ -44,6 +44,8 @@ public sealed partial class FormCommit : GitModuleForm
private readonly TranslationString _commitAndPush = new("Commit && &push");
+ private readonly TranslationString _commitAndForcePush = new("Commit && force &push");
+
private readonly TranslationString _deleteFailed = new("Delete file failed");
private readonly TranslationString _deleteSelectedFiles =
@@ -3360,7 +3362,9 @@ private void stopTrackingThisFileToolStripMenuItem_Click(object sender, EventArg
private void SetCommitAndPushText()
{
- CommitAndPush.Text = Reset.Enabled || Amend.Checked ? _commitAndPush.Text : TranslatedStrings.ButtonPush;
+ CommitAndPush.Text = Amend.Checked && AppSettings.CommitAndPushForcedWhenAmend ? _commitAndForcePush.Text
+ : Reset.Enabled || Amend.Checked ? _commitAndPush.Text
+ : TranslatedStrings.ButtonPush;
}
internal TestAccessor GetTestAccessor()
diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
index 0456569da3a..a9e7806da80 100644
--- a/GitUI/Translation/English.xlf
+++ b/GitUI/Translation/English.xlf
@@ -3387,7 +3387,7 @@ gitex.cmd / gitex (located in the same folder as GitExtensions.exe):
-
+
@@ -3407,7 +3407,7 @@ gitex.cmd / gitex (located in the same folder as GitExtensions.exe):
-
+
@@ -3428,7 +3428,7 @@ gitex.cmd / gitex (located in the same folder as GitExtensions.exe):
-
+
@@ -3452,6 +3452,10 @@ Use this feature when a file is big and never change.
Git will never check if the file has changed that will improve status check performance.
+
+
+
+