]> git.proxmox.com Git - rustc.git/commitdiff
projects / rustc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 593de90)
Add .gitattributes for merging d/changelog
authorXimin Luo <infinity0@debian.org>
Tue, 25 Jul 2017 21:24:25 +0000 (23:24 +0200)
committerXimin Luo <infinity0@debian.org>
Tue, 25 Jul 2017 21:24:25 +0000 (23:24 +0200)
debian/.gitattributes [new file with mode: 0644] patch | blob

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644 (file)
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
backport for Debian buster