summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-02 01:34:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-22 21:17:15 (GMT)
commit48d5014dd42cc4a4465162c9807eaa253715e105 (patch)
tree5b9c28a6b72920ba051a32e69e0f49fd7f983bec /Documentation
parentbe5a750939c212bc0781ffa04fabcfd2b2bd744e (diff)
downloadgit-48d5014dd42cc4a4465162c9807eaa253715e105.zip
git-48d5014dd42cc4a4465162c9807eaa253715e105.tar.gz
git-48d5014dd42cc4a4465162c9807eaa253715e105.tar.bz2
config.abbrev: document the new default that auto-scales
We somehow forgot to update the "default is 7" in the documentation. Also give a way to explicitly ask the auto-scaling by setting config.abbrev to "auto". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a0ab66a..b02f8a4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -783,10 +783,11 @@ core.sparseCheckout::
linkgit:git-read-tree[1] for more information.
core.abbrev::
- Set the length object names are abbreviated to. If unspecified,
- many commands abbreviate to 7 hexdigits, which may not be enough
- for abbreviated object names to stay unique for sufficiently long
- time.
+ Set the length object names are abbreviated to. If
+ unspecified or set to "auto", an appropriate value is
+ computed based on the approximate number of packed objects
+ in your repository, which hopefully is enough for
+ abbreviated object names to stay unique for some time.
add.ignoreErrors::
add.ignore-errors (deprecated)::