X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ed16e5fd9fdf5a7e3716d951731868414e13563c..516908cc8e90743fc8616ed8421170b3da46ffd4:/doc/git.mdwn diff --git a/doc/git.mdwn b/doc/git.mdwn index dc0376213..d268757cc 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -25,10 +25,10 @@ Some of the branches included in the main repository include: work with the current *master* branch again. * `html` is an unfinished attempt at making ikiwiki output HTML 4.01 instead of xhtml. -* `prefix-directives` changes the preprocessor directive syntax. It - is approximately one failing test case away from merging. * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. * `pristine-tar` contains deltas that [pristine-tar](http://kitenet.net/~joey/code/pristine-tar) can use to recreate released tarballs of ikiwiki +* `debian-stable` is used for updates to the old version included in + Debian's stable release.