Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Thu, 31 May 2007 07:15:14 +0000 (00:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 31 May 2007 07:15:14 +0000 (00:15 -0700)
* 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

1  2 
cache.h
sha1_file.c

diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge