(no commit message)

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0f280fb350bf86557985293369459f0db0200943..b8bf501c6aad688282c4efc64caa3166699b964a 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -10,11 +10,7 @@ rejected.
 
        git clone git://git.ikiwiki.info/
 
 
        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).
+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
 
 Commits to this git repository are fed into [CIA](http://cia.vc), and can
 be browsed, subscribed to etc on its


@@ -33,10 +29,12 @@ think about merging them. This is recommended. :-)
 
 * github `git://github.com/joeyh/ikiwiki.git`
   ([browse](http://github.com/joeyh/ikiwiki/tree/master))  
 
 * github `git://github.com/joeyh/ikiwiki.git`
   ([browse](http://github.com/joeyh/ikiwiki/tree/master))  

-  A mirror of the main repo, automatically updated.
+  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 <http://l10n.ikiwiki.info/>
 * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git`
 * l10n `git://l10n.ikiwiki.info/`
   Open push localization branch used for <http://l10n.ikiwiki.info/>
 * [[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`
 * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`


@@ -61,28 +59,24 @@ think about merging them. This is recommended. :-)
 * [[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`
 * [[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`
+* [[users/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`
+* [[yds]] `git://github.com/yds/ikiwiki.git`
+* [[pelle]] `git://github.com/hemmop/ikiwiki.git`
+* [[chrismgray]] `git://github.com/chrismgray/ikiwiki.git`

 
 ## branches
 
 
 ## 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.
-
-Some of the branches included in the main repository include:
+Current branches of ikiwiki are listed on [[branches]].

 
 

-* `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