summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-07-05 14:45:06 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2012-07-05 14:45:06 +0200
commit4ceaf0d0dca0a273624938d0fec36c34ae2704fc (patch)
tree05b25959200a97972531daae1dcabf3aae8736d2
parent39fc166f28074226a7aae86ad27e8b1739142b26 (diff)
downloaddotfiles-4ceaf0d0dca0a273624938d0fec36c34ae2704fc.tar.gz
dotfiles-4ceaf0d0dca0a273624938d0fec36c34ae2704fc.tar.xz
dotfiles-4ceaf0d0dca0a273624938d0fec36c34ae2704fc.zip
gitconfig: add overview of branches in merge-commit-messages
-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