Dont commit merge now generic option. Closes #1882

gitextensions · Jun 7, 2013 · 9ec3842 · 9ec3842
1 parent 46384c8
commit 9ec3842
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 41 deletions.
diff --git a/GitCommands/Settings.cs b/GitCommands/Settings.cs
@@ -874,6 +874,12 @@ public static bool NoFastForwardMerge
             set { SetBool("NoFastForwardMerge", value); }
         }
 
+        public static bool DontCommitMerge
+        {
+            get { return GetBool("DontCommitMerge", false); }
+            set { SetBool("DontCommitMerge", value); }
+        }
+
         public static int CommitValidationMaxCntCharsFirstLine
         {
             get { return GetInt("CommitValidationMaxCntCharsFirstLine", 0); }

diff --git a/GitUI/CommandsDialogs/FormMergeBranch.Designer.cs b/GitUI/CommandsDialogs/FormMergeBranch.Designer.cs
diff --git a/GitUI/CommandsDialogs/FormMergeBranch.cs b/GitUI/CommandsDialogs/FormMergeBranch.cs
@@ -14,6 +14,7 @@ public FormMergeBranch(GitUICommands aCommands, string defaultBranch)
         {
             InitializeComponent();
             Translate();
+            noCommit.Checked = Settings.DontCommitMerge;
             helpImageDisplayUserControl1.Visible = !Settings.DontShowHelpImages;
             _defaultBranch = defaultBranch;
 
@@ -47,6 +48,7 @@ private void FormMergeBranchLoad(object sender, EventArgs e)
         private void OkClick(object sender, EventArgs e)
         {
             Settings.NoFastForwardMerge = noFastForward.Checked;
+            Settings.DontCommitMerge = noCommit.Checked;
 
             var successfullyMerged = FormProcess.ShowDialog(this, 
                 GitCommandHelpers.MergeBranchCmd(Branches.GetSelectedText(), fastForward.Checked, squash.Checked, noCommit.Checked, _NO_TRANSLATE_mergeStrategy.Text));
@@ -79,13 +81,11 @@ private void advanced_CheckedChanged(object sender, EventArgs e)
             NonDefaultMergeStrategy.Visible = advanced.Checked;
             NonDefaultMergeStrategy_CheckedChanged(null, null);
             squash.Visible = advanced.Checked;
-            noCommit.Visible = advanced.Checked;
 
             if (!advanced.Checked)
             {
                 NonDefaultMergeStrategy.Checked = false;
                 squash.Checked = false;
-                noCommit.Checked = false;
             }
         }