Merge branch 'jc/abbrev-autoscale-config' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 23:00:31 +0000 (15:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 23:00:31 +0000 (15:00 -0800)
commit631e4200e24e33c510350f5984676395e28417ec
tree9b7bf636dd89c2c52aa51835cab332be8a5c0388
parentb63805e6f6bb891905414779e199f94e42b4b822
parent48d5014dd42cc4a4465162c9807eaa253715e105
Merge branch 'jc/abbrev-autoscale-config' into next

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
Documentation/config.txt
config.c