mention ignore branch

[ikiwiki.git] / doc / git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 06bccc7a320c136cbe06ebf86d57d0fbec675eb3..f6971e84b49fd9725c1e9fee36142a0661b8dcb5 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -64,6 +64,8 @@ Some of the branches included in the main repository include:
 * `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.
+* `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