Add a configuration option to control diffstat after merge

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

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index d9e11c65344a52fd81023e26cc1535ac825106dd..2531238df45a39ad6a60ae8d489cdac871ad45b3 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


@@ -127,6 +127,25 @@ base-name::
        This flag tells the command not to reuse existing deltas
        but compute them from scratch.
 
        This flag tells the command not to reuse existing deltas
        but compute them from scratch.
 

+--no-reuse-object::
+       This flag tells the command not to reuse existing object data at all,
+       including non deltified object, forcing recompression of everything.
+       This implies --no-reuse-delta. Useful only in the obscure case where
+       wholesale enforcement of a different compression level on the
+       packed data is desired.
+
+--compression=[N]::
+       Specifies compression level for newly-compressed data in the
+       generated pack.  If not specified,  pack compression level is
+       determined first by pack.compression,  then by core.compression,
+       and defaults to -1,  the zlib default,  if neither is set.
+       Data copied from loose objects will be recompressed
+       if core.legacyheaders was true when they were created or if
+       the loose compression level (see core.loosecompression and
+       core.compression) is now a different value than the pack
+       compression level.  Add --no-reuse-object if you want to force
+       a uniform compression level on all data no matter the source.
+

 --delta-base-offset::
        A packed archive can express base object of a delta as
        either 20-byte object name or as an offset in the
 --delta-base-offset::
        A packed archive can express base object of a delta as
        either 20-byte object name or as an offset in the