summaryrefslogtreecommitdiff
path: root/doc/git.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-29 01:13:24 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-29 01:13:24 -0400
commit44ce9563a328ecb3b5fa8fd97afa30c3033fca76 (patch)
treefc77cb66e60ed00aafa09783a955f9c6082f6c2b /doc/git.mdwn
parent03449610d6c666ba24bea68f01d896613e522278 (diff)
note that debian-* branches are subject to being rebased
Diffstat (limited to 'doc/git.mdwn')
-rw-r--r--doc/git.mdwn2
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