summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 493e6b1..3ce9f8a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -50,6 +50,9 @@
[push]
default = matching
+[pull]
+ ff = only
+
[merge]
tool = vimdiff