summaryrefslogtreecommitdiffstats
path: root/debian/local/gitattributes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:49:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 14:49:04 +0000
commitec7d37955709054f482a77996d790aa881c2b9fc (patch)
treeab35186ac2c6bfddd6d3659dadb3acb457ad87dc /debian/local/gitattributes
parentSetting log.follow to true. (diff)
downloadgit-ec7d37955709054f482a77996d790aa881c2b9fc.tar.xz
git-ec7d37955709054f482a77996d790aa881c2b9fc.zip
Adding dpkg-mergechangelogs merge driver for debian/changelog files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/local/gitattributes')
-rw-r--r--debian/local/gitattributes3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/local/gitattributes b/debian/local/gitattributes
new file mode 100644
index 0000000..35a8b89
--- /dev/null
+++ b/debian/local/gitattributes
@@ -0,0 +1,3 @@
+# /etc/gitattributes
+
+debian/changelog merge=dpkg-mergechangelogs