1 files changed, 3 insertions, 0 deletions

diff --git a/gitconfig b/gitconfig
index d74ea7d..bdc0121 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,5 +18,8 @@
 [merge]
     tool = vimdiff
 
+[pull]
+    ff = only
+
 [credential]
     helper = store