aboutsummaryrefslogtreecommitdiffstats
path: root/.config/git
diff options
context:
space:
mode:
Diffstat (limited to '.config/git')
-rw-r--r--.config/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
index 06c6e88..bca3150 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -103,6 +103,8 @@
whitespace = nowarn
[branch]
autosetupmerge = true
+[pull]
+ ff = only
[push]
# 'git push' will push the current branch to its tracking branch
# the usual default is to push all branches