From: Joey Hess Date: Tue, 26 Jul 2011 15:30:17 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Tag: 3.20110905~110 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f8421938fbf0806eb95dafa58fc0ba97a9216301?hp=2555257ade5c26bea93e0a6c45764f58cfcbf149 Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/git.mdwn b/doc/git.mdwn index f3ae0c673..6d23d82da 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -71,6 +71,7 @@ think about merging them. This is recommended. :-) ([browse](http://git.debian.org/?p=users/jo-guest/ikiwiki.git;a=summary)) * [[timonator]] `git://github.com/timo/ikiwiki.git` * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/` +* nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` ## branches diff --git a/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn b/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn index d03b7fe93..fe4d7209e 100644 --- a/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn +++ b/doc/todo/Auto-setup_and_maintain_Mercurial_wrapper_hooks.mdwn @@ -7,6 +7,8 @@ ikiwiki can keep track of lines in `hgrc` for which it is responsible by adding Two ways follow below. I prefer the long one. --[[Daniel Andersson]] +> I comment myself: this can probably be solved without adding ad-hoc hooks and stuff (maybe not as "correct" as changing the config file only directly after wrappers have been generated, but good enough). I have a large rewrite of `mercurial.pm` ready, currently under local testing before I upload it for comments here, trying to make it equal in function to `git.pm`. Comments below are of course welcome, but I will look into other ways of solving it later. --[[Daniel Andersson]] + Compact way (addresses only point 1) ------------------------------------ [This patch at pastebin](http://pastebin.com/by9f4dwX) ([raw version](http://pastebin.com/raw.php?i=by9f4dwX)).