updated from pesco's darcs repo, current to Oct 11 version

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index d268757cc7936c64b423a19f6cced830d77567a6..e5fef6a5adad4b449c934e62c16778b0d11ae279 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -9,6 +9,8 @@ Or like this if your firewall only passes http traffic (slow):
 
 The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki).
 
 
 The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki).
 

+There is also a mirror [on github](http://github.com/joeyh/ikiwiki/tree/master).
+

 Commits to this git repository are fed into [CIA](http://cia.vc), and can
 be browsed, subscribed to etc on its
 [project page](http://cia.vc/stats/project/ikiwiki).
 Commits to this git repository are fed into [CIA](http://cia.vc), and can
 be browsed, subscribed to etc on its
 [project page](http://cia.vc/stats/project/ikiwiki).


@@ -27,8 +29,10 @@ Some of the branches included in the main repository include:
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.

+* `darcs` is being used to add darcs support.

 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `debian-stable` is used for updates to the old version included in
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `debian-stable` is used for updates to the old version included in

-  Debian's stable release.
+  Debian's stable release, and `debian-testing` is used for updates to
+  Debian's testing release.