From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 Jan 2011 17:37:52 +0000 (-0400)
Subject: add a branches page
X-Git-Tag: 3.20110122~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e93f31a5ef49275a750c20f96890d2ecc517fe88

add a branches page
---

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
new file mode 100644
index 000000000..c2a55d746
--- /dev/null
+++ b/doc/branches.mdwn
@@ -0,0 +1,24 @@
+In order to refer to a branch in one of the [[git]] repositories, for
+example when submitting a [[patch]], you can use the
+[[templates/gitbranch]] template.
+
+Branches referred to in open [[bugs]] and [[todo]]:
+
+[[!inline pages="(todo/* or bugs/*) and link(branches) and !link(bugs/done)
+and !link(todo/done) and !*/*/*" show=0 archive=yes]]
+
+The main ikiwiki git repository has some branches included in it, too:
+
+* `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
+  due to license issues.  Also some bits need to be tweaked to make it
+  work with the current *master* branch again.
+* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
+  changes.
+* `debian-stable` is used for updates to the old version included in
+  Debian's stable release, and `debian-testing` is used for updates to
+  Debian's testing release. (These and similar branches will be rebased.)
+* `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)
+  can use to recreate released tarballs of ikiwiki
diff --git a/doc/git.mdwn b/doc/git.mdwn
index 5943097e6..ce20938f4 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -69,22 +69,5 @@ think about merging them. This is recommended. :-)
 
 ## branches
 
-In order to refer to a branch in one of the above git repositories, for
-example when submitting a [[patch]], you can use the
-[[templates/gitbranch]] template.
+Current branches of ikiwiki are listed on [[branches]].
 
-Some of the branches included in the main repository include:
-
-* `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
-  due to license issues.  Also some bits need to be tweaked to make it
-  work with the current *master* branch again.
-* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
-  changes.
-* `debian-stable` is used for updates to the old version included in
-  Debian's stable release, and `debian-testing` is used for updates to
-  Debian's testing release. (These and similar branches will be rebased.)
-* `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)
-  can use to recreate released tarballs of ikiwiki
diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn
index 962420940..79444cda5 100644
--- a/doc/templates/gitbranch.mdwn
+++ b/doc/templates/gitbranch.mdwn
@@ -1,5 +1,5 @@
 <span class="infobox">
-Available in a [[!taglink /git]] repository.<br />
+Available in a [[!taglink /git]] repository [[branch|/branches]].<br />
 Branch: <TMPL_VAR branch><br />
 Author: <TMPL_VAR author><br />
 </span>
@@ -13,6 +13,4 @@ these parameters:
   (e.g. github/master)</li>
 <li>author - the author of the branch</li>
 </ul>
-
-It also automatically tags the branch with `/git`.
 </TMPL_UNLESS>