summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-31 21:32:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-31 21:32:06 (GMT)
commit46ab22261661a8b4d2e86badc55d26017739dc31 (patch)
treee9352ba61eff34622265b97c350b29b6cc3eddd4 /Documentation
parent867ce0416c74ac5d403765ea94673ab8969b1a81 (diff)
parent48d5014dd42cc4a4465162c9807eaa253715e105 (diff)
downloadgit-46ab22261661a8b4d2e86badc55d26017739dc31.zip
git-46ab22261661a8b4d2e86badc55d26017739dc31.tar.gz
git-46ab22261661a8b4d2e86badc55d26017739dc31.tar.bz2
Merge branch 'jc/abbrev-autoscale-config' into maint
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 aba7568..1fee83c 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)::