summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:32 (GMT)
commit2bfb182bc544214b3a15058b52b3a00c9811e3c2 (patch)
tree7bc80ce4ab1e3c8e6ca79d8c001384ec591a951a /Documentation
parent5b51f0d38d24a21dc69a53e972497928183d399e (diff)
parentd4316604f85c99a503832128a6dfb0f5ea101298 (diff)
downloadgit-2bfb182bc544214b3a15058b52b3a00c9811e3c2.zip
git-2bfb182bc544214b3a15058b52b3a00c9811e3c2.tar.gz
git-2bfb182bc544214b3a15058b52b3a00c9811e3c2.tar.bz2
Merge branch 'ew/repack-with-bitmaps-by-default'
The connectivity bitmaps are created by default in bare repositories now; also the pathname hash-cache is created by default to avoid making crappy deltas when repacking. * ew/repack-with-bitmaps-by-default: pack-objects: default to writing bitmap hash-cache t5310: correctly remove bitmaps for jgit test repack: enable bitmaps by default on bare repos
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/pack.txt4
-rw-r--r--Documentation/config/repack.txt2
2 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 425c73a..9cdcfa7 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -124,6 +124,4 @@ pack.writeBitmapHashCache::
bitmapped and non-bitmapped objects (e.g., when serving a fetch
between an older, bitmapped pack and objects that have been
pushed since the last gc). The downside is that it consumes 4
- bytes per object of disk space, and that JGit's bitmap
- implementation does not understand it, causing it to complain if
- Git and JGit are used on the same repository. Defaults to false.
+ bytes per object of disk space. Defaults to true.
diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt
index a5c3781..9c413e1 100644
--- a/Documentation/config/repack.txt
+++ b/Documentation/config/repack.txt
@@ -24,4 +24,4 @@ repack.writeBitmaps::
packs created for clones and fetches, at the cost of some disk
space and extra time spent on the initial repack. This has
no effect if multiple packfiles are created.
- Defaults to false.
+ Defaults to true on bare repos, false otherwise.