Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / users / xma / discussion.mdwn

diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn
index d7c50f8a09b62acfa3675f484805451564f8ee4c..34adbf82176e14c680e60e2039a77781b8534bf2 100644 (file)
--- a/doc/users/xma/discussion.mdwn
+++ b/doc/users/xma/discussion.mdwn
@@ -4,8 +4,15 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there
 > allow users to push doc wiki only changesets anonymously, but you can
 > mails changesets to me. --[[Joey]]
 > > How can I send you the changesets ? (git command) --[[xma]]
 > allow users to push doc wiki only changesets anonymously, but you can
 > mails changesets to me. --[[Joey]]
 > > How can I send you the changesets ? (git command) --[[xma]]

+> > > `git-format-patch` --[[Joey]]
+
+> > > > Glad to hear I can mail changesets to you, since I wrote the [[todo/applydiff_plugin]] wishlist entry. --[[intrigeri]]

 
 > It would be nice to have a git recieve hook that
 > checked that a commit contained only changes to .mdwn or other allowed
 > extensions.. if someone writes up a good one, I'd be willing to deploy it
 > for ikiwiki. --[[Joey]]
 
 > It would be nice to have a git recieve hook that
 > checked that a commit contained only changes to .mdwn or other allowed
 > extensions.. if someone writes up a good one, I'd be willing to deploy it
 > for ikiwiki. --[[Joey]]

+
+> > I'll think about it. It may solve some of my offline-being issues. --[[intrigeri]]
+
+>>>> Now developed! --[[Joey]]