diff options
Diffstat (limited to 'doc/git.mdwn')
| -rw-r--r-- | doc/git.mdwn | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn index 5943097e6..ce20938f4 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -69,22 +69,5 @@ 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. +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 |