is this merge-worthy?

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 18fbd238b27e65868d6f73506cd50b0737927c42..ce762b0cd925f287d75c181dedec14b503ac29c7 100644 (file)
--- 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.
 * 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 <http://l10n.ikiwiki.info/>

 * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
 * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
 * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
 * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`


@@ -46,6 +48,10 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git`
 * [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
 * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.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`
+* [[bbb]] `http://git.boulgour.com/bbb/ikiwiki.git`

 
 ## branches
 
 
 ## branches
 


@@ -60,7 +66,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
   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
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki