Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/doc/git.mdwn b/doc/git.mdwn
index f6971e84b49fd9725c1e9fee36142a0661b8dcb5..008f109dfd1f48b077e513df48ff5700cf6e61bb 100644 (file)
--- 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