Merge branch 'maint'

[git.git] / Documentation / git-pack-objects.txt

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index fdc6f9728921e3bf71a57d441c99c8fb7d280803..bd3ee456e336add5d880d6a1192646220e7c34d7 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -83,7 +83,7 @@ base-name::
        it too deep affects the performance on the unpacker
        side, because delta data needs to be applied that many
        times to get to the necessary object.
        it too deep affects the performance on the unpacker
        side, because delta data needs to be applied that many
        times to get to the necessary object.

-       The default value for both --window and --depth is 10.
+       The default value for --window is 10 and --depth is 50.

 
 --incremental::
        This flag causes an object already in a pack ignored
 
 --incremental::
        This flag causes an object already in a pack ignored


@@ -138,6 +138,11 @@ base-name::
        length, this option typically shrinks the resulting
        packfile by 3-5 per-cent.
 
        length, this option typically shrinks the resulting
        packfile by 3-5 per-cent.
 

+--index-version=<version>[,<offset>]::
+       This is intended to be used by the test suite only. It allows
+       to force the version for the generated pack index, and to force
+       64-bit index entries on objects located above the given offset.
+

 
 Author
 ------
 
 Author
 ------