From 542fa9ffaef0691a3a9f4ffef65f12e22c57d849 Mon Sep 17 00:00:00 2001
From: littleblack111 <littleblack11111@gmail.com>
Date: Mon, 13 Oct 2025 22:56:18 +0800
Subject: bump

---
 dot-gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dot-gitconfig')

diff --git a/dot-gitconfig b/dot-gitconfig
index 88e1be6b..86c0d5aa 100644
--- a/dot-gitconfig
+++ b/dot-gitconfig
@@ -31,3 +31,5 @@
 	autosquash = true
 [core]
 	sshCommand = ssh -p 222
+[merge]
+	ff = false
-- 
cgit v1.2.3