Added a comment: Tracking ikiwiki templates
author84.127.5.232 <84.127.5.232@web>
Tue, 31 Mar 2009 08:27:47 +0000 (08:27 +0000)
committerStefano Zacchiroli <zack@fettunta.org>
Tue, 31 Mar 2009 08:27:47 +0000 (08:27 +0000)
blog/posts/2009/03/enabling_comments_with_style/comment_4._comment [new file with mode: 0644]

diff --git a/blog/posts/2009/03/enabling_comments_with_style/comment_4._comment b/blog/posts/2009/03/enabling_comments_with_style/comment_4._comment
new file mode 100644 (file)
index 0000000..3f9e435
--- /dev/null
@@ -0,0 +1,9 @@
+[[!_comment format=mdwn
+ ip="84.127.5.232"
+ claimedauthor="Adeodato Simó"
+ url="http://chistera.yi.org/~adeodato/"
+ subject="Tracking ikiwiki templates"
+ date="2009-03-31T08:27:45Z"
+ content="""
+FWIW, I do merge myself ikiwiki upstream changes to the templates into those I have modified in my wiki. However, I do not this by merging from ikiwiki.git directly. Rather, I use a somewhat more manual method: I have a git repository in which from time to time I copy those templates I have modifications for from /usr/share/ikiwiki/templates, and then merge that. I guess if Git would allow just merging a sub-tree, what you want to do would work out very nicely.
+"""]]