aboutsummaryrefslogtreecommitdiff
path: root/git/gitconfig.m4
diff options
context:
space:
mode:
Diffstat (limited to 'git/gitconfig.m4')
-rw-r--r--git/gitconfig.m43
1 files changed, 3 insertions, 0 deletions
diff --git a/git/gitconfig.m4 b/git/gitconfig.m4
index ea6b1220..060740a2 100644
--- a/git/gitconfig.m4
+++ b/git/gitconfig.m4
@@ -21,6 +21,9 @@
date = local
decorate = short
+[merge]
+ ff = false
+
[push]
default = matching