From 5ff9286488eb3708d4ac646960fb8513d3c7a4e6 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 18 Jan 2018 13:01:31 +1300
Subject: Always add --log to `git merge`

---
 git/gitconfig.mi5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index 5a50c13c..3c97a77d 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -40,6 +40,7 @@
 
 [merge]
     ff = false
+    log = true
 
 [pager]
     diff = cat
-- 
cgit v1.2.3