summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-01-10 15:24:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-10 15:24:26 -0800
commit33cf69403c29880fb2b3de71be42fdc428dcca19 (patch)
tree064bc9bcb2e1c9e8e1d23d5e79a08def5e3bcd80 /Documentation
parentMerge branch 'mh/fast-import-notes-fix-new' (diff)
parentconfig.abbrev: document the new default that auto-scales (diff)
downloadtgif-33cf69403c29880fb2b3de71be42fdc428dcca19.tar.xz
Merge branch 'jc/abbrev-autoscale-config'
Recent update to the default abbreviation length that auto-scales lacked documentation update, which has been corrected. * jc/abbrev-autoscale-config: config.abbrev: document the new default that auto-scales
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 1abf078c4e..506431267e 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)::