aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2008-07-15 10:49:47 -0400
committerJoey Hess <joey@kitenet.net>2008-07-15 10:49:47 -0400
commit128c2730af63eb11632c793e0172d9c63e658bf3 (patch)
tree139d7c172df2955fc58eed24f6b6722a9387d356
parent531c15ab530fd7cec108c16d3706dcc1761c3d0e (diff)
downloadikiwiki-128c2730af63eb11632c793e0172d9c63e658bf3.tar
ikiwiki-128c2730af63eb11632c793e0172d9c63e658bf3.tar.gz
web commit by intrigeri: pedigree: renamed to parentlinks, replace core parentlinks
-rw-r--r--doc/todo/pedigree_plugin.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/todo/pedigree_plugin.mdwn b/doc/todo/pedigree_plugin.mdwn
index bb8406344..9504a964b 100644
--- a/doc/todo/pedigree_plugin.mdwn
+++ b/doc/todo/pedigree_plugin.mdwn
@@ -156,9 +156,9 @@ Any opinions on the idea/design/implementation?
>>>>> with only `PEDIGREE`, `DEPTH`, `HEIGHT`, `DEPTH_n` and
>>>>> `HEIGHT_n`. -- intrigeri
->>>>>> Done, and pushed in my pedigree branch. I'm going to start
->>>>>> preparing the rename + move of parentlinks from the core.
->>>>>> --[[intrigeri]]
+>>>>>> Done, and pushed in my pedigree branch. Update: I've also done and
+>>>>>> pushed two commits that rename the plugin and replace
+>>>>>> the core parentlinks with this one. --[[intrigeri]]
(I'll try never to rebase this branch, but writing this plugin has
been a pretext for me to start learning Git, so...)