Modern git requires pull.ff setting

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index c5eff0d930a8b7ffa71db3a193e79fc642660991..0263b614a5323972a520d289b4be8ddd385cbe30 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -36,3 +36,5 @@
        lineNumber = true
 [merge]
        tool = vimdiff
+[pull]
+       ff = only