diff --git a/.gitconfig b/.gitconfig
index 93baf99..7e46aa8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,3 +17,5 @@
 	stash = false
 [diff "ansible-vault"]
 	textconv = ansible-vault view
+[pull]
+	ff = only