summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2020-08-12 19:57:00 +0200
committerTobias Klauser <tklauser@distanz.ch>2020-08-12 19:57:00 +0200
commitb66f4e808e60ef21285d429dfefb150cf20d2085 (patch)
treea4c27b19be16c4e6d64caeb542e959fc62d018ff /.gitconfig
parentc905c5cf674ef51f6c428a00c7481124230e6a40 (diff)
.gitconfig: set pull.ff=only
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