From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 16 Jul 2015 04:08:21 +0000 (-0400)
Subject: gitconfig: add merge-changelog driver
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=db0968c66ff8e4cb583e132105d6f1fb2924d9c6;p=home.git

gitconfig: add merge-changelog driver
---

diff --git a/.gitconfig b/.gitconfig
index 52821c7..9dcfea2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -51,6 +51,9 @@
 	conflictstyle = diff3
 [rebase]
 	autosquash = true
+[merge "merge-changelog"]
+	name = GNU-style ChangeLog merge driver
+	driver = /usr/bin/git-merge-changelog %O %A %B
 [sendemail]
 	chainreplyto = false
 	confirm = always