X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/11a781d1c5d614b12b2f358faf5be9951b62ae37..ea9f75881b1a2eeba0075c8928f690cfa8eff870:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index d268757cc..6d23d82da 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -1,34 +1,79 @@ -Ikiwiki is developed in a git repository and can be checked out -like this: +Ikiwiki, and this documentation wiki, are developed in a git repository and +can be checked out like this: - git clone git://git.ikiwiki.info/ - -Or like this if your firewall only passes http traffic (slow): +[[!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 http://git.ikiwiki.info/ikiwiki.git/ + git clone git://git.ikiwiki.info/ -The gitweb is [here](http://git.ikiwiki.info/?p=ikiwiki). +The gitweb is [here](http://source.ikiwiki.branchable.com/?p=source.git;a=summary). 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). +[project page](http://cia.vc/stats/project/ikiwiki). They're also fed into +[twitter](http://twitter.com/ikiwiki). -## branches +## personal git repositories You are of course free to set up your own ikiwiki git repository with your -own [[patches|patch]]. - -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. -* `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. +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 repository where he can see your branches and +think about merging them. 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. Also provides http + cloning at `http://github.com/joeyh/ikiwiki.git` +* l10n `git://l10n.ikiwiki.info/` + Open push localization branch used for +* [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git` + ([browse](http://git.pseudorandom.co.uk/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` +* [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki` + ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary)) +* [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git` +* [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git` +* [[privat]] `git://github.com/privat/ikiwiki.git` +* [[blipvert]] `git://github.com/blipvert/ikiwiki.git` +* [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git` +* [[wtk]] `git://github.com/wking/ikiwiki.git` +* [[sunny256]] `git://github.com/sunny256/ikiwiki.git` +* [[fmarier]] `git://gitorious.org/~fmarier/ikiwiki/fmarier-sandbox.git` +* [[levitte]] `git://github.com/levitte/ikiwiki.git` +* jo `git://git.debian.org/users/jo-guest/ikiwiki.git` + ([browse](http://git.debian.org/?p=users/jo-guest/ikiwiki.git;a=summary)) +* [[timonator]] `git://github.com/timo/ikiwiki.git` +* [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/` +* nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` + +## branches + +Current branches of ikiwiki are listed on [[branches]]. +