X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Fgit.mdwn;h=8a89546cf7d3fff0d791ead8acc39e58f1530e7b;hb=1473fb0b4fe89eeaf3740c4c6c97338d542b3d97;hp=53fd9efcdeb698660f59d7dea0d2f5434cb3e111;hpb=9082bd4c2b0f5b78a7c90aea3af57f736c33a674;p=ikiwiki.git

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 53fd9efcd..8a89546cf 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -1,5 +1,59 @@
-Git is a distributed revison control system originally developed for the linux kernel. Ikiki supports storing a wiki in git.
+Ikiwiki, and this documentation wiki, are developed in a git repository and
+can be checked out like this:
 
-Ikiwiki can run as a post-update hook to update a wiki whenever commits
-come in. When running as a [[cgi]] with Git, ikiwiki automatically
-commits edited pages, and uses the Git history to generate the [[RecentChanges]] page.
\ No newline at end of file
+[[!template id=note text="""
+You can push changes back to ikiwiki's git repository over the `git://`
+transport, to update this wiki, if you'd like, instead of editing it on the
+web. Changes that could not be made via the web will be automatically
+rejected.
+"""]]
+
+	git clone git://git.ikiwiki.info/
+
+Or like this if your firewall only passes http traffic (slow):
+
+	git clone http://git.ikiwiki.info/ikiwiki.git/
+
+The gitweb is [here](http://git.ikiwiki.info/?p=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). They're also fed into
+[twitter](http://twitter.com/ikiwiki).
+
+## personal git repositories
+
+You are of course free to set up your own ikiwiki git repository with your
+own [[patches|patch]]. If you list it here, the `gitremotes` script will
+automatically add it to git remotes. Your repo will automatically be pulled
+into [[Joey]]'s working tree. This is recommended. :-)
+
+<!-- Machine-parsed format: * wikilink <git:url> -->
+
+* github `git://github.com/joeyh/ikiwiki.git`
+  ([browse](http://github.com/joeyh/ikiwiki/tree/master))  
+  A mirror of the main repo, automatically updated.
+* [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
+* [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
+* [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
+* [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
+* [[hendry]] `git://webconverger.org/git/ikiwiki`
+
+## branches
+
+Some of the branches included in the main repository include:
+
+* `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
+  due to license issues.  Also some bits need to be tweaked to make it
+  work with the current *master* branch again.
+* `html` is an unfinished attempt at making ikiwiki output HTML 4.01
+  instead of xhtml.
+* `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
+  changes.
+* `darcs` is being used to add darcs support.
+* `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.
+* `pristine-tar` contains deltas that
+  [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
+  can use to recreate released tarballs of ikiwiki