summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 11c3212..ab63441 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,3 +22,6 @@
[core]
excludesfile = ~/.dotfiles/gitglobalignore
+
+[merge]
+ log = true