X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/0f97eee42bc7e8c372bfd4a81f40361b2de3e7fd..0408c95ba09c9798a824a89ae3b5684fe541a6c0:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 00ab0c7..be05efa 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,6 +23,9 @@
 	autosetuprebase = remote
 [merge]
 	tool = vimdiff
+[merge "dpkg-mergechangelogs"]
+	name = debian/changelog merge driver
+	driver = dpkg-mergechangelogs -m %O %A %B %A
 [diff]
 	tool = vimdiff
 [gui]
@@ -49,3 +52,5 @@
 	autocorrect = 5
 [format]
 	signoff = true
+[rerere]
+	enabled = true