aboutsummaryrefslogtreecommitdiff
path: root/doc/git.mdwn
blob: 0f280fb350bf86557985293369459f0db0200943 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
Ikiwiki, and this documentation wiki, are developed in a git repository and
can be checked out like this:

[[!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 repository where he can see your branches and
think about merging them. 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.
* 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`
* [[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`

## 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:

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