From 0e7c1f6213050bfe184dd25595518a1bba2c2368 Mon Sep 17 00:00:00 2001
From: Alex Scerba <alex@scerba.org>
Date: Tue, 29 Oct 2024 10:35:11 -0400
Subject: Force merge to --ff-only

---
 .config/git/config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.config')

diff --git a/.config/git/config b/.config/git/config
index 5fc98ca..ff2d46b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -14,9 +14,10 @@
 	hooksPath = ~/.config/git/hooks
 [alias]
 	l = log --all --oneline --graph --decorate
-#[pull]
+[pull]
 #	rebase = true
 [merge]
 	conflictstyle = zdiff3
+	ff = only
 [diff]
 	algorithm = histogram
-- 
cgit v1.2.3