index
:
git.git
master
git configuration
Tobias Klauser
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
.gitconfig
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
(limited to '.gitconfig')
-rw-r--r--
.gitconfig
3
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