X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9082bd4c2b0f5b78a7c90aea3af57f736c33a674..bcf74bd8f8b72abb6466fef1b6848dc4cb5eb7b2:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index 53fd9efcd..30fed6afc 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -1,5 +1,79 @@ -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. :-) + + + +* 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` +* [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git` +* [[hendry]] `git://webconverger.org/git/ikiwiki` +* [[jon]] `git://github.com/jmtd/ikiwiki.git` +* [[ikipostal|DavidBremner]] `git://pivot.cs.unb.ca/git/ikipostal.git` +* [[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` +* [[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` +* [[KathrynAndersen]] `git://github.com/rubykat/ikiplugins.git` +* [[ktf]] `git://github.com/ktf/ikiwiki.git` +* [[tove]] `git://github.com/tove/ikiwiki.git` +* [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki` +* [[roktas]] `git://github.com/roktas/ikiwiki.git`` + +## 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. +* `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. (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