summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-24 11:12:35 -0400
committerJoey Hess <joey@kitenet.net>2010-05-24 11:12:35 -0400
commitc5693eb872c10beb7f2abf5086b79dc0095ab750 (patch)
treea35137bcdd4d590568e9e01ac4bcb347ea6eab37 /.gitattributes
parentae491f11ac0f2448e411effe4289cd962cfb206f (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