summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-24 11:12:36 -0400
committerJoey Hess <joey@kitenet.net>2010-05-24 11:12:36 -0400
commit2d3e933c8648abd859ea6f81c1544946bbca6f7c (patch)
treea53f710dcbfd92ab361c00f4149068273881655e /.gitattributes
parentb443114d1538ee94e9d9d43db3f9b72ee4f1666a (diff)
use dpkg-mergechangelog
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs