Merge branch 'pb/prepare-commit-msg'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6d8cca46ab934826a84647cbd6e441fee286f330..f9bdb164e054ec2d633baab3da69ddd47e14931f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -766,6 +766,12 @@ pack.indexVersion::
        whenever the corresponding pack is larger than 2 GB.  Otherwise
        the default is 1.
 
+pack.packSizeLimit:
+       The default maximum size of a pack.  This setting only affects
+       packing to a file, i.e. the git:// protocol is unaffected.  It
+       can be overridden by the `\--max-pack-size` option of
+       linkgit:git-repack[1].
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.