Fill in the feature matrix.

[git.ikiwiki.info.git] / doc / branches.mdwn

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 4accc21cabc9e0ec3b9570abd63327a87a5aabb7..232f2ce6a71f1cd14ca2b85d4d8dad2baf7c5e02 100644 (file)
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -4,6 +4,9 @@ example when submitting a [[patch]], you can use the
 
        \[[!template id=gitbranch branch=yourrepo/amazingbranch author="\[[yourname]]"]]
 
 
        \[[!template id=gitbranch branch=yourrepo/amazingbranch author="\[[yourname]]"]]
 

+Branches that have been [[reviewed]] and need work will not be listed
+here.
+

 Branches referred to in open [[bugs]] and [[todo]]:
 
 [[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)
 Branches referred to in open [[bugs]] and [[todo]]:
 
 [[!inline pages="(todo/* or bugs/*) and link(/branches) and !link(bugs/done)


@@ -17,6 +20,6 @@ Long-lived branches in the main git repository:
 * `ignore` gets various branches merged to it that [[Joey]] wishes to ignore
   when looking at everyone's unmerged changes.
 * `pristine-tar` contains deltas that
 * `ignore` gets various branches merged to it that [[Joey]] wishes to ignore
   when looking at everyone's unmerged changes.
 * `pristine-tar` contains deltas that

-  [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
+  [pristine-tar](http://joeyh.name/code/pristine-tar)

   can use to recreate released tarballs of ikiwiki
   can use to recreate released tarballs of ikiwiki

-
+* `setup` contains the ikiwiki.setup file for this site