summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-27 21:00:39 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-27 21:00:39 -0400
commit04a8da4f0176d153fed7d9a1c483f19b70f32900 (patch)
tree557be2bce1b69ce6310ad71ee14d9c8dad381e88 /doc
parentff0cb2a7bf0756bb232cd73fc8bb6616737448c1 (diff)
mention ignore branch
Diffstat (limited to 'doc')
-rw-r--r--doc/git.mdwn2
1 files changed, 2 insertions, 0 deletions
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