From 8e046f1b3f39bd2c5bca498965c7d082057982dd Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 8 Nov 2017 14:13:26 -0500
Subject: git: Use git-merge-changelog if available

---
 .config/git/attributes | 1 +
 .config/git/config     | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 .config/git/attributes

diff --git a/.config/git/attributes b/.config/git/attributes
new file mode 100644
index 0000000..56444aa
--- /dev/null
+++ b/.config/git/attributes
@@ -0,0 +1 @@
+ChangeLog    merge=merge-changelog
diff --git a/.config/git/config b/.config/git/config
index 6e5abf2..21efa65 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -5,6 +5,9 @@
 	ui = auto
 [push]
 	default = matching
+[merge "merge-changelog"]
+	name = GNU-style ChangeLog merge driver
+	driver =git-merge-changelog %O %A %B
 [alias]
 	lg = log --graph --format='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 	hist = log --format='%h %ci -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit
-- 
cgit v1.1-4-g5e80