summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-03-14 12:43:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-03-14 12:43:34 -0400
commitbfa15bd66500d041a72b5ddb03117d434b1ecfde (patch)
tree2bce85e788152eca056feb522bc83fba189d2107
parent342fc28437f59edcea8fb61ff987ea1899140f35 (diff)
no-bloom branch
-rw-r--r--doc/download.mdwn5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 2727cc191..30307f308 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -23,13 +23,12 @@ The git repository has some branches:
* `debian-stable` contains the latest backport of git-annex to Debian
stable.
* `no-s3` disables the S3 special remote, for systems that lack the
- necessary haskell library.
+ necessary haskell library. (merge it into master if you need it)
+* `no-bloom` avoids using bloom filters. (merge it into master if you need it)
* `old-monad-control` is for systems that don't have a newer monad-control
library.
* `tweak-fetch` adds support for the git tweak-fetch hook, which has
been proposed and implemented but not yet accepted into git.
-* `bloom` makes `git annex unused` use a bloom filter, thus running
- in truely constant memory. Waiting on the haskell library being packaged.
* `ghc7.0` supports versions of ghc older than 7.4, which
had a major change to filename encoding.
* `setup` contains configuration for this website