X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b12770ac3e382e82125e2950a3ea6594584bb2c6..036c081706d598031da3c681e828a0dc4f2d6f17:/doc/branches.mdwn diff --git a/doc/branches.mdwn b/doc/branches.mdwn index bc3bdc668..232f2ce6a 100644 --- a/doc/branches.mdwn +++ b/doc/branches.mdwn @@ -1,6 +1,11 @@ In order to refer to a branch in one of the [[git]] repositories, for example when submitting a [[patch]], you can use the -[[templates/gitbranch]] template. +[[templates/gitbranch]] template. For example: + + \[[!template id=gitbranch branch=yourrepo/amazingbranch author="\[[yourname]]"]] + +Branches that have been [[reviewed]] and need work will not be listed +here. Branches referred to in open [[bugs]] and [[todo]]: @@ -15,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