X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a1aa71efc9d1db42b425f43afc1ff4a37c4c0f3a..ea166ca334934a5950ee4756a7291fc69961e77c:/doc/git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0f280fb35..ba7922807 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -37,6 +37,7 @@ think about merging them. This is recommended. :-)
 * l10n `git://l10n.ikiwiki.info/`
   Open push localization branch used for <http://l10n.ikiwiki.info/>
 * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
+  ([browse](http://git.pseudorandom.co.uk/smcv/ikiwiki.git))
 * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
@@ -62,27 +63,14 @@ think about merging them. This is recommended. :-)
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
+* [[privat]] `git://github.com/privat/ikiwiki.git`
+* [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
+* [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git`
+* [[wtk]] `git://github.com/wking/ikiwiki.git`
+* [[sunny256]] `git://github.com/sunny256/ikiwiki.git`
+* fmarier `git://gitorious.org/~fmarier/ikiwiki/fmarier-sandbox.git`
 
 ## 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.
-* `html` is an unfinished attempt at making ikiwiki output HTML 4.01
-  instead of xhtml.
-* `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