(no commit message)

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index fef2e01e0abc0849365ea24397cd5c707b34ef73..ce20938f44fe1323c68776ae299c0d2a779e153b 100644 (file)
--- 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
 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> -->
 
 
 <!-- Machine-parsed format: * wikilink <git:url> -->
 


@@ -53,23 +54,20 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[kaizer]] `git://github.com/engla/ikiwiki.git`
 * [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`
 * [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`
 * [[kaizer]] `git://github.com/engla/ikiwiki.git`
 * [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`
 * [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git`

+* [[ktf]] `git://github.com/ktf/ikiwiki.git`
+* [[tove]] `git://github.com/tove/ikiwiki.git`
+* [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
+* [[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
 
 
 ## branches
 

-Some of the branches included in the main repository include:
+Current branches of ikiwiki are listed on [[branches]].

 
 

-* `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