aboutsummaryrefslogtreecommitdiffstats
path: root/debian/.gitattributes
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@debian.org>2020-12-16 14:13:26 +0100
committerGuilhem Moulin <guilhem@debian.org>2020-12-16 14:13:26 +0100
commit2ce885e19f4a5f18da30c35dc7da7a204e2ceb58 (patch)
tree5d6747f139cae49d0cdf56f4d931b171b4c17378 /debian/.gitattributes
parent2e485797d8ec91a0a74ec1f1e2e8723cf74a586e (diff)
Rebuild for buster-backports.debian/0.5.4-1_bpo10+1
* d/gbp.conf: Set debian-branch=debian/buster-backports. * d/salsa-ci.yml: Set RELEASE variable to "buster-backports" and SALSA_CI_DISABLE_VERSION_BUMP to 1. * d/.gitattributes: New file to merge d/changelog with dpkg-mergechangelogs(1).
Diffstat (limited to 'debian/.gitattributes')
-rw-r--r--debian/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..592f8c4
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+/changelog merge=dpkg-mergechangelogs