X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Fbranches.mdwn;h=b7b9164acd0c8bcbc3cc96e5e0e2134af1933b56;hb=fb9f8a21e131c0ac1bbcaefa544ad67c51dd1846;hp=bc3bdc668b7e2526627ecef16cf663dfa72ebe3a;hpb=b12770ac3e382e82125e2950a3ea6594584bb2c6;p=ikiwiki.git diff --git a/doc/branches.mdwn b/doc/branches.mdwn index bc3bdc668..b7b9164ac 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]]: @@ -17,4 +22,4 @@ Long-lived branches in the main git repository: * `pristine-tar` contains deltas that [pristine-tar](http://kitenet.net/~joey/code/pristine-tar) can use to recreate released tarballs of ikiwiki - +* `setup` contains the ikiwiki.setup file for this site