From 3ba6d398e22b85620bbb31e2c5f227a28ca4baef Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 2 Feb 2016 18:58:56 +0100
Subject: gitconfig: add log=5000 to merge

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 37a2be9..fc78559 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,6 +17,7 @@
 	sslCAPath = /etc/ssl/certs
 [merge]
 	summary = true
+	log = 5000
 [branch "debian-merge"]
 	mergeoptions = --no-ff --no-commit
 [branch "debian"]
-- 
cgit v1.2.3