diff --git a/gitconfig b/gitconfig
index 7b0c8d6..21d1951 100644
--- a/gitconfig
+++ b/gitconfig
@@ -51,3 +51,5 @@
 [diff "enc"]
   textconv = bundle exec rails encrypted:show
   cachetextconv = false
+[pull]
+	ff = only