X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/03f567ba7759c88dbc4a9d4446604dcb8c4451f9..fa82be552452ffcd554fcd6af5aa94ff3cf90ac5:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index 11364a0f2..a3b56c682 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -33,6 +33,8 @@ into [[Joey]]'s working tree. This is recommended. :-) * github `git://github.com/joeyh/ikiwiki.git` ([browse](http://github.com/joeyh/ikiwiki/tree/master)) A mirror of the main repo, automatically updated. +* l10n `git://l10n.ikiwiki.info/` + Open push localization branch used for * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git` * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git` * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git` @@ -43,10 +45,12 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[ikimailbox|DavidBremner]] `git://pivot.cs.unb.ca/git/ikimailbox.git` * [[ikiplugins|DavidBremner]] `git://pivot.cs.unb.ca/git/ikiplugins.git` * [[jonas|JonasSmedegaard]] `git://source.jones.dk/ikiwiki-upstream` -* [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git]] -* [[chrysn]] `git://github.com/github076986099/ikiwiki.git]] -* [[kjikaqawej]] `git://github.com/kjikaqawej/ikiwiki-simon.git]] -* [[jmtd]] `git://github.com/jmtd/ikiwiki.git]] +* [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git` +* [[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 @@ -61,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