X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9ca8de2e75bc9a11b1b8547b375a887a8b1ef60b..3bb00d142a4d31316fc6f0eb1277aa2fafe4dbe9:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index 06bccc7a3..a3b56c682 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -49,6 +49,8 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[chrysn]] `git://github.com/github076986099/ikiwiki.git` * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git` * [[schmonz]] `git://github.com/schmonz/ikiwiki.git` +* [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git` +* [[kaizer]] `git://github.com/engla/ikiwiki.git` ## branches @@ -63,7 +65,9 @@ Some of the branches included in the main repository include: 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. + 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