projects / filters.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 0d0afb2)
Merge remote-tracking branch 'dgit/dgit/sid'
authorJoey Hess <joey@kitenet.net>
Mon, 4 Nov 2013 16:33:46 +0000 (12:33 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Nov 2013 16:33:46 +0000 (12:33 -0400)
.gitattributes [new file with mode: 0644] patch | blob

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..5d42584
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
collection of filters, including B1FF and the Swedish Chef
This page took 0.010818 seconds and 4 git commands to generate.