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