diff --git a/gitconfig b/gitconfig
index 10c7c79..3dcb514 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,6 +3,8 @@
   followTags = true
 [rebase]
   autosquash = true
+[pull]
+  ff = only
 [user]
   name = Philippe Serhal
   email = philippe@goodeggs.com