Skip to content

Commit d3991c6

Browse files
committed
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)
1 parent 2670bd8 commit d3991c6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Models/MergeMode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class MergeMode
77
new MergeMode("Default", "Fast-forward if possible", ""),
88
new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
99
new MergeMode("Squash", "Use '--squash'", "--squash"),
10-
new MergeMode("Don't commit", "Merge without commit", "--no-commit"),
10+
new MergeMode("Don't commit", "Merge without commit", "--no-ff --no-commit"),
1111
];
1212

1313
public string Name { get; set; }

0 commit comments

Comments
 (0)