X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9ca8de2e75bc9a11b1b8547b375a887a8b1ef60b..acd4adbbccb15598b4603498c023d2fa04c0979c:/doc/git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 06bccc7a3..008f109df 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -63,7 +63,9 @@ 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
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki