X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f5c270b11dbfb2589df21388a07f55002e076d3c..56259466ee806a258694670c5715bf02c6e7c212:/doc/todo/web_reversion.mdwn?ds=sidebyside

diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn
index 4335b3fbf..736d674fe 100644
--- a/doc/todo/web_reversion.mdwn
+++ b/doc/todo/web_reversion.mdwn
@@ -67,14 +67,7 @@ Peter Gammie has done an initial implementation of the above.
 >>
 >> Please look it over and tell me what else needs fixing... -- [[peteg]]
 
->>> I have made my own revert branch and put a few fixes in there
->>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]]
->>> (and fixed all the indention..). Issues I noticed but have not gotten
->>> to: --[[Joey]] 
->>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]]
+>>> I have made my own revert branch and put a few^Wseveral fixes in there.
+>>> All merged to master now! --[[Joey]] 
 
->>> * I quite don't understand why one caller of `git_parse_changes`
->>>   needs it to chdir, and not the other one. It's running
->>>   in the same git repo either way, and git doesn't need
->>>   `git show` to run in a subdir at all..
->>>> I was aping (preserving) what was already there. I don't understand what you say about `git show` - it must run under $srcdir, surely? And empirically the CGI process wasn't in the right place. By all means simplify that. -- [[peteg]]
+[[done]]