git(config): fast-forward merge only

gelocraft · Dec 10, 2024 · 29252cc · 29252cc
1 parent f5dee6c
commit 29252cc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -31,6 +31,7 @@
     hunk-header-number-line-style =  "#dcd7ba"
 
 [merge]
+	ff = only
 	conflictstyle = diff3
 
 [diff]