From 29252cc4e2b5345f971175496a7cd269d0d2efb5 Mon Sep 17 00:00:00 2001
From: geloman <geloman-likes-rust@users.noreply.github.com>
Date: Wed, 11 Dec 2024 02:23:58 +0800
Subject: [PATCH] git(config): fast-forward merge only

---
 .gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitconfig b/.gitconfig
index fe488be..dd353a4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -31,6 +31,7 @@
     hunk-header-number-line-style =  "#dcd7ba"
 
 [merge]
+	ff = only
 	conflictstyle = diff3
 
 [diff]