diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-08-29 01:13:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-08-29 01:13:24 -0400 |
| commit | 44ce9563a328ecb3b5fa8fd97afa30c3033fca76 (patch) | |
| tree | fc77cb66e60ed00aafa09783a955f9c6082f6c2b /doc | |
| parent | 03449610d6c666ba24bea68f01d896613e522278 (diff) | |
| download | ikiwiki-44ce9563a328ecb3b5fa8fd97afa30c3033fca76.tar ikiwiki-44ce9563a328ecb3b5fa8fd97afa30c3033fca76.tar.gz | |
note that debian-* branches are subject to being rebased
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn index f6971e84b..008f109df 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -63,7 +63,7 @@ Some of the branches included in the main repository include: changes. * `debian-stable` is used for updates to the old version included in Debian's stable release, and `debian-testing` is used for updates to - Debian's testing release. + Debian's testing release. (These and similar branches will be rebased.) * `ignore` gets various branches merged to it that Joey wishes to ignore when looking at everyone's unmerged changes. * `pristine-tar` contains deltas that |