1 files changed, 3 insertions, 0 deletions

diff --git a/git/config b/git/config
index ff07707..3209ba3 100644
--- a/git/config
+++ b/git/config
@@ -11,5 +11,8 @@
 [diff]
   algorithm = histogram
 
+[pull]
+  ff = only
+
 [user]
   name = Grégoire Duchêne