aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git/gitconfig.m43
1 files changed, 3 insertions, 0 deletions
diff --git a/git/gitconfig.m4 b/git/gitconfig.m4
index dfe46157..73bdae98 100644
--- a/git/gitconfig.m4
+++ b/git/gitconfig.m4
@@ -26,6 +26,9 @@
[merge]
ff = false
+[pull]
+ ff = only
+
[push]
default = current