index
:
dotfiles
master
personal dotfiles
Alexander Sulfrian
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
(limited to '')
-rw-r--r--
gitconfig
3
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