diff --git a/git/gitconfig.j2 b/git/gitconfig.j2
index 27e7c5f..a717331 100644
--- a/git/gitconfig.j2
+++ b/git/gitconfig.j2
@@ -113,6 +113,7 @@
     requireForce = true
 [pull]
     rebase = true
+    ff = only
 
 [url "ssh://git@code.hkoerber.de:2222/"]
     insteadOf = https://code.hkoerber.de/