diff --git a/.gitconfig b/.gitconfig
index 88526336..782d5002 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,3 +14,5 @@
 	squash-all = "!f(){ git reset $(git commit-tree \"HEAD^{tree}\" \"$@\");};f"
 [push]
 	autoSetupRemote = true
+[pull]
+	ff = only