Add dpkg-mergechangelogs merge driver
authorJulien Valroff <julien@kirya.net>
Sat, 23 Apr 2011 07:49:09 +0000 (09:49 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 23 Apr 2011 07:49:09 +0000 (09:49 +0200)
.gitconfig

index f65b0d7..f98512f 100644 (file)
@@ -6,3 +6,7 @@
     insteadOf = kirya:
 [url "git+ssh://git.debian.org/git/"]
     insteadOf = debian:
+
+[merge "dpkg-mergechangelogs"]
+    name = debian/changelog merge driver
+    driver = dpkg-mergechangelogs -m %O %A %B %A