headless git branches: unmangling patch

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

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 4accc21cabc9e0ec3b9570abd63327a87a5aabb7..b7b9164acd0c8bcbc3cc96e5e0e2134af1933b56 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)


@@ -19,4 +22,4 @@ Long-lived branches in the main git repository:
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki

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