Merge commit 'intrigeri/po'

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 1cd91e532f36b0738ecdef98a7e0addb7e8eaabb..f6971e84b49fd9725c1e9fee36142a0661b8dcb5 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.
+* 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`
@@ -62,6 +64,8 @@ Some of the branches included in the main repository include:
 * `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.
+* `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