From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 28 Aug 2009 01:00:39 +0000 (-0400)
Subject: mention ignore branch
X-Git-Tag: 3.1415926~37
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04a8da4f0176d153fed7d9a1c483f19b70f32900;p=ikiwiki.git

mention ignore branch
---

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 06bccc7a3..f6971e84b 100644
--- 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