Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / applydiff_plugin.mdwn

diff --git a/doc/todo/applydiff_plugin.mdwn b/doc/todo/applydiff_plugin.mdwn
index 5f63336913d319dbb549bb5b0e8e6f975674956c..d26b0dfe924ff24f090705674ace25ec28517f01 100644 (file)
--- a/doc/todo/applydiff_plugin.mdwn
+++ b/doc/todo/applydiff_plugin.mdwn
@@ -1,4 +1,4 @@
-[[!tag wishlist]]
+[[!tag wishlist done]]
 
 [[!toc ]]
 
@@ -100,3 +100,11 @@ Also see [[joey]]'s idea on [[users/xma/discussion]], to allow (filtered) anonym
 >> I think it makes more sense than using diffs, and so think this todo
 >> could probably be closed.
 >> --[[Joey]]
+
+>>> I agree, closing this. I really prefer this solution to the one I was
+>>> initially proposing.
+>>> Is this pre-receive hook already enabled on ikiwiki.info?
+>>> If not, do you plan to enable it at some point?
+>>> --[[intrigeri]]
+
+>>>> [[news/git_push_to_this_wiki]] gave me the answer. Well done! --[[intrigeri]]