X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5017568721b598026dcb730157b66614b14a5a01..34558e45ada6934fe690bfc1989bfd70d8c18338:/doc/git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 98f09014e..ce20938f4 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -65,26 +65,9 @@ think about merging them. This is recommended. :-)
 * [[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|W. Trevor King]]: `git://github.com/wking/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.
+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