Merge branch 'maint'

* maint:
git-config: Improve documentation of git-config file handling
git-config: Various small fixes to asciidoc documentation
decode_85(): fix missing return.
fix signed range problems with hex conversions

diff --cc cache.h
Simple merge

diff --cc sha1_file.c
Simple merge