summaryrefslogtreecommitdiff
path: root/git/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'git/gitconfig')
-rw-r--r--git/gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig
index 01b5277..00cb691 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -37,3 +37,6 @@
[tig]
diff-highlight = true
+
+[pull]
+ ff = only