Merge branch 'jc/abbrev-autoscale-config' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:06 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:06 +0000 (13:32 -0800)
commit46ab22261661a8b4d2e86badc55d26017739dc31
treee9352ba61eff34622265b97c350b29b6cc3eddd4
parent867ce0416c74ac5d403765ea94673ab8969b1a81
parent48d5014dd42cc4a4465162c9807eaa253715e105
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
Documentation/config.txt
config.c