From 9e2c8a96cd3f54644f38d43d7beb347edda0684c Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Thu, 13 Aug 2009 17:14:32 -0400 Subject: add me new repo, yarrr --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 18fbd238b..1cd91e532 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -46,6 +46,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From 9ca8de2e75bc9a11b1b8547b375a887a8b1ef60b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 14:40:40 -0400 Subject: add l10n branch --- doc/git.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 1cd91e532..06bccc7a3 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -33,6 +33,8 @@ 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` -- cgit v1.2.3 From 04a8da4f0176d153fed7d9a1c483f19b70f32900 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 21:00:39 -0400 Subject: mention ignore branch --- doc/git.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 06bccc7a3..f6971e84b 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -64,6 +64,8 @@ Some of the branches included in the main repository include: * `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. +* `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 -- cgit v1.2.3 From 44ce9563a328ecb3b5fa8fd97afa30c3033fca76 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 29 Aug 2009 01:13:24 -0400 Subject: note that debian-* branches are subject to being rebased --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index f6971e84b..008f109df 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -63,7 +63,7 @@ Some of the branches included in the main repository include: 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. + 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 -- cgit v1.2.3 From 4026650c8751f29890692f10833dae2b200cfc78 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Sep 2009 15:10:13 -0400 Subject: add will's git repo --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 008f109df..16af30584 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -49,6 +49,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From 628f07f4c881031ab91fc436cf244b91541f0ea8 Mon Sep 17 00:00:00 2001 From: "http://kaizer.se/" Date: Thu, 17 Sep 2009 11:18:19 -0400 Subject: add repo with one patch --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 16af30584..5b71f4065 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -50,6 +50,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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.se]] `git://github.com/engla/ikiwiki.git` ## branches -- cgit v1.2.3 From 28f893d120633dbfd3e85f4063b90f255f058d9b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Sep 2009 12:45:04 -0400 Subject: reduce name to \w+ so gitremotes will parse it --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 5b71f4065..a3b56c682 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -50,7 +50,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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.se]] `git://github.com/engla/ikiwiki.git` +* [[kaizer]] `git://github.com/engla/ikiwiki.git` ## branches -- cgit v1.2.3 From f4c40a62aab3cdb13e5e766f3a3e0dafa49a165b Mon Sep 17 00:00:00 2001 From: "http://bruno.boulgour.com/" Date: Sun, 18 Oct 2009 14:42:23 -0400 Subject: Added bbb git repository --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index a3b56c682..ce762b0cd 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -51,6 +51,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From 124200f3e31624457eb71167a1e74ce2aa70b819 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Mon, 30 Nov 2009 21:42:58 -0500 Subject: added my ikiwiki plugins git repo --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index ce762b0cd..fef2e01e0 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -52,6 +52,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From 31adf108c8760f11e677f7acdb732b28c0d365ed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Dec 2009 12:55:54 -0500 Subject: add another github fork --- doc/git.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index fef2e01e0..293446772 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -53,6 +53,8 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` + ## branches -- cgit v1.2.3 From ed67ff3b844f54392a4eb46cf7da297e7da61126 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Jan 2010 15:12:05 -0500 Subject: add tove --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 293446772..d21a282e4 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -54,6 +54,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From a250a55baaf86c6c8ebc35f908a9fc2e3c7526b4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Jan 2010 15:34:35 -0500 Subject: add repo --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index d21a282e4..5167ad004 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -55,6 +55,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From e269fbd7af187b986c9e52ae8459b57d70c64bcd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Jan 2010 04:35:58 -0500 Subject: new repo --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 5167ad004..30fed6afc 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -56,7 +56,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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 -- cgit v1.2.3 From c6f27f9dfaa689a32342a412d6fd19d63453ee85 Mon Sep 17 00:00:00 2001 From: David Riebenbauer Date: Tue, 2 Feb 2010 14:32:51 +0100 Subject: add git repository 'davrieb' and document branch on userpage --- doc/git.mdwn | 4 +++- doc/users/David_Riebenbauer.mdwn | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 30fed6afc..289937121 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -56,7 +56,9 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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`` +* [[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)) ## branches diff --git a/doc/users/David_Riebenbauer.mdwn b/doc/users/David_Riebenbauer.mdwn index 372a28588..d7469696e 100644 --- a/doc/users/David_Riebenbauer.mdwn +++ b/doc/users/David_Riebenbauer.mdwn @@ -1,2 +1,8 @@ Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through + +## Branches in his [[git]] repository ## + +* `autotag` +([browse](http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag)) +See [[todo/auto-create_tag_pages_according_to_a_template]] -- cgit v1.2.3 From 1c751e882ef2fe68bc4601dc5e927c4813f09706 Mon Sep 17 00:00:00 2001 From: "http://gustaf.thorslund.org/" Date: Mon, 29 Mar 2010 21:54:30 +0000 Subject: --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 289937121..379285a49 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -59,6 +59,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From ef1ebf6079bd2a91d1d799bafacf6a51d4633db3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Apr 2010 00:28:56 -0400 Subject: add peter's git repo --- doc/git.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 379285a49..55967e543 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -26,7 +26,8 @@ be browsed, subscribed to etc on its 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. :-) +into [[Joey]]'s working repository where he can see your branches and +think about merging them. This is recommended. :-) @@ -60,6 +61,7 @@ into [[Joey]]'s working tree. 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` +* [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git` ## branches -- cgit v1.2.3 From a1aa71efc9d1db42b425f43afc1ff4a37c4c0f3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Apr 2010 13:49:20 -0400 Subject: document the gitbranch template --- doc/git.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 55967e543..0f280fb35 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -65,6 +65,10 @@ think about merging them. This is recommended. :-) ## 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 -- cgit v1.2.3 From 4afe2d1170e85a09d43460045b5825fce081c469 Mon Sep 17 00:00:00 2001 From: privat Date: Fri, 23 Apr 2010 17:20:51 +0000 Subject: add my repository in the list --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index 0f280fb35..a5fd742ca 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -62,6 +62,7 @@ think about merging them. This is recommended. :-) ([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` ## branches -- cgit v1.2.3 From 0689f2dbc5d4f80cd13f51055b24ff0506f638fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Apr 2010 13:43:24 -0400 Subject: add blipvert --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index a5fd742ca..a0b9c950f 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -63,6 +63,7 @@ think about merging them. This is recommended. :-) * [[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` ## branches -- cgit v1.2.3 From 7cb31560a584cf8f62723e0a142fddafa637f09e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 May 2010 23:07:15 -0400 Subject: dropped old html branch --- doc/git.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index a0b9c950f..c0f42a704 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -76,8 +76,6 @@ 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 -- cgit v1.2.3 From 85dea5786a5fee835b9677e5267d487813104018 Mon Sep 17 00:00:00 2001 From: BerndZeimetz Date: Tue, 11 May 2010 23:57:45 +0000 Subject: Add bzed's git repo to the list of repositories to pull from --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/git.mdwn') diff --git a/doc/git.mdwn b/doc/git.mdwn index c0f42a704..88608d4b5 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -64,6 +64,7 @@ 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` ## branches -- cgit v1.2.3