From 9f4f2ed7df9c926920e2c06307303363c6c0d919 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@gwairfelin.com>
Date: Wed, 8 Oct 2025 16:34:30 +0100
Subject: [PATCH] ff on pull

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

diff --git a/home/dot_config/git/config b/home/dot_config/git/config
index 8485294..ef277d2 100644
--- a/home/dot_config/git/config
+++ b/home/dot_config/git/config
@@ -67,6 +67,7 @@
     this = rev-parse --abbrev-ref HEAD
 [pull]
     rebase = false
+    ff = true
 [sendemail]
     smtpserver = mail.friedersdorff.com
     smtpuser = max