From e2fe2f27d4a0b96643cd706ac81b1f14dae1830c Mon Sep 17 00:00:00 2001
From: Alex Scerba <alex@scerba.org>
Date: Tue, 29 Oct 2024 10:43:55 -0400
Subject: Force pull to --ff-only

---
 .config/git/config | 1 +
 1 file changed, 1 insertion(+)

(limited to '.config')

diff --git a/.config/git/config b/.config/git/config
index ff2d46b..e830e43 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -16,6 +16,7 @@
 	l = log --all --oneline --graph --decorate
 [pull]
 #	rebase = true
+	ff = only
 [merge]
 	conflictstyle = zdiff3
 	ff = only
-- 
cgit v1.2.3