diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-15 19:36:48 -0400 |
| commit | 1f7f5d5e0e21920c5f15290cd34594ad91077071 (patch) | |
| tree | a19302c57ed6ea46c4bf05a1ed8d840725643069 /doc/git.mdwn | |
| parent | 917f54a777d152ee5963acd81bf8a2800a0507b1 (diff) | |
| parent | 20e691fe20ead76d826ab77501c6e9cbc7b487e8 (diff) | |
Merge branch 'master' into darcs
Diffstat (limited to 'doc/git.mdwn')
| -rw-r--r-- | doc/git.mdwn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn index fc702b325..e5fef6a5a 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -29,8 +29,10 @@ Some of the branches included in the main repository include: instead of xhtml. * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some changes. +* `darcs` is being used to add darcs support. * `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. + Debian's stable release, and `debian-testing` is used for updates to + Debian's testing release. |