gitconfig: add merge-changelog driver

diff --git a/.gitconfig b/.gitconfig
index 52821c7966c2c8a370b450b5fef50bd0f32c08a4..9dcfea20b5bed429fe9b5da7ea44b42f974559c6 100644 (file)
--- 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