X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/acd10522980712a91b8a801e974240ff90af829e..80b244d857584c7cc4092e00265b62568c2a681e:/doc/branches.mdwn diff --git a/doc/branches.mdwn b/doc/branches.mdwn index 5149d79f9..232f2ce6a 100644 --- a/doc/branches.mdwn +++ b/doc/branches.mdwn @@ -20,6 +20,6 @@ Long-lived branches in the main git repository: * `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) + [pristine-tar](http://joeyh.name/code/pristine-tar) can use to recreate released tarballs of ikiwiki - +* `setup` contains the ikiwiki.setup file for this site