Merge branch 'lt/objformat'

* lt/objformat:
sha1_file: add the ability to parse objects in "pack file format"

diff --cc Documentation/config.txt
Simple merge

diff --cc sha1_file.c
Simple merge