[DHG_packages] 02/02: Configure git to use dpkg-mergechangelogs for changelog files

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch experimental
in repository DHG_packages.

commit 24916c5ea7d1c5d59a887860e6d2a5b0c54d6b5e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Sep 1 18:55:57 2015 -0700

    Configure git to use dpkg-mergechangelogs for changelog files
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..fbed2d6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# see man dpkg-mergechangelogs(1), section INTEGRATION WITH GIT
+p/*/debian/changelog merge=dpkg-mergechangelogs
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git