From d3991c653591a33c2b40d374b9337788419feff8 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 1 Oct 2024 20:44:14 +0800
Subject: [PATCH] fix: use `--no-ff --no-commit` for `Don't Commit` option in
 merge popup to ensure branch is not changed or updated with fast-forward
 commits (#532)

---
 src/Models/MergeMode.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/MergeMode.cs b/src/Models/MergeMode.cs
index 23ace5c5..15e3f7e9 100644
--- a/src/Models/MergeMode.cs
+++ b/src/Models/MergeMode.cs
@@ -7,7 +7,7 @@
             new MergeMode("Default", "Fast-forward if possible", ""),
             new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
             new MergeMode("Squash", "Use '--squash'", "--squash"),
-            new MergeMode("Don't commit", "Merge without commit", "--no-commit"),
+            new MergeMode("Don't commit", "Merge without commit", "--no-ff --no-commit"),
         ];
 
         public string Name { get; set; }