aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2010-02-03 22:48:28 -0500
committerJunio C Hamano <gitster@pobox.com>2010-02-03 20:39:56 -0800
commit07cf0f2407709e3764ea989696b513ec32613504 (patch)
tree3eab6f3be18ea1e04abbf8c34e706f021b78c28f /Documentation/config.txt
parenta2430dde8ceaaaabf05937438249397b883ca77a (diff)
downloadgit-07cf0f2407709e3764ea989696b513ec32613504.tar.gz
git-07cf0f2407709e3764ea989696b513ec32613504.tar.xz
make --max-pack-size argument to 'git pack-object' count in bytes
The value passed to --max-pack-size used to count in MiB which was inconsistent with the corresponding configuration variable as well as other command arguments which are defined to count in bytes with an optional unit suffix. This brings --max-pack-size in line with the rest of Git. Also, in order not to cause havoc with people used to the previous megabyte scale, and because this is a sane thing to do anyway, a minimum size of 1 MiB is enforced to avoid an explosion of pack files. Adjust and extend test suite accordingly. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 36ad992a5..4c36aa95b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1368,10 +1368,13 @@ you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
the `{asterisk}.idx` file.
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].
+ The maximum size of a pack. This setting only affects
+ packing to a file when repacking, i.e. the git:// protocol
+ is unaffected. It can be overridden by the `\--max-pack-size`
+ option of linkgit:git-repack[1]. The minimum size allowed is
+ limited to 1 MiB. The default is unlimited.
+ Common unit suffixes of 'k', 'm', or 'g' are
+ supported.
pager.<cmd>::
Allows turning on or off pagination of the output of a