projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f6ea9a)
auto changelog merging
authorJoey Hess <joey@kitenet.net>
Fri, 25 Jun 2010 17:43:02 +0000 (13:43 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 25 Jun 2010 17:43:02 +0000 (13:43 -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
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.