X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7cb31560a584cf8f62723e0a142fddafa637f09e..2c865d07c15f19c2621092d28d7809bbeb5bd82b:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index c0f42a704..2a2d10526 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -37,6 +37,7 @@ think about merging them. This is recommended. :-) * 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` @@ -64,25 +65,11 @@ think about merging them. This is recommended. :-) * [[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` ## branches -In order to refer to a branch in one of the above git repositories, for -example when submitting a [[patch]], you can use the -[[templates/gitbranch]] template. +Current branches of ikiwiki are listed on [[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. -* `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