From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 29 Aug 2009 05:13:24 +0000 (-0400)
Subject: note that debian-* branches are subject to being rebased
X-Git-Tag: 3.1415926~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44ce9563a328ecb3b5fa8fd97afa30c3033fca76;p=ikiwiki.git

note that debian-* branches are subject to being rebased
---

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