X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c6f27f9dfaa689a32342a412d6fd19d63453ee85..512d860c169d776885922b7eaff0bcb2b722f12a:/doc/git.mdwn?ds=inline

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 289937121..5943097e6 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -26,7 +26,8 @@ be browsed, subscribed to etc on its
 You are of course free to set up your own ikiwiki git repository with your
 own [[patches|patch]]. If you list it here, the `gitremotes` script will
 automatically add it to git remotes. Your repo will automatically be pulled
-into [[Joey]]'s working tree. This is recommended. :-)
+into [[Joey]]'s working repository where he can see your branches and
+think about merging them. This is recommended. :-)
 
 <!-- Machine-parsed format: * wikilink <git:url> -->
 
@@ -59,16 +60,24 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[roktas]] `git://github.com/roktas/ikiwiki.git`
 * [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
   ([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`
 
 ## 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.
+
 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