Merge branch 'jc/abbrev-guard'

* jc/abbrev-guard:
  core.abbrevguard: Ensure short object names stay unique a bit longer

diff --cc Documentation/config.txt
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc sha1_name.c
Simple merge