summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-06 12:11:26 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-06 12:11:26 -0700
commit9018af4f98b98738f3cd1268a16d143762ebb6f2 (patch)
tree6ec427b399f44084128658cd2e6d58626e9cd87f /Documentation
parent4ac9aeb2b217090b750773cf87be361b88b253a6 (diff)
parent89d71f7564cb3945b2775092284a4de807f577e4 (diff)
downloadgit-9018af4f98b98738f3cd1268a16d143762ebb6f2.tar.gz
Merge branch 'jk/repack-reuse-object'
* jk/repack-reuse-object: Documentation: pack.compression: explain how to recompress repack: add -F flag to let user choose between --no-reuse-delta/object
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/git-repack.txt6
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e6d74e6ade..71ddb6c171 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1472,6 +1472,10 @@ pack.compression::
not set, defaults to -1, the zlib default, which is "a default
compromise between speed and compression (currently equivalent
to level 6)."
++
+Note that changing the compression level will not automatically recompress
+all existing objects. You can force recompression by passing the -F option
+to linkgit:git-repack[1].
pack.deltaCacheSize::
The maximum memory in bytes used for caching deltas in
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 8c67d1724f..9566727f7a 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -8,7 +8,7 @@ git-repack - Pack unpacked objects in a repository
SYNOPSIS
--------
-'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]
+'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
DESCRIPTION
-----------
@@ -62,6 +62,10 @@ other objects in that pack they already have locally.
linkgit:git-pack-objects[1].
-f::
+ Pass the `--no-reuse-delta` option to `git-pack-objects`, see
+ linkgit:git-pack-objects[1].
+
+-F::
Pass the `--no-reuse-object` option to `git-pack-objects`, see
linkgit:git-pack-objects[1].