Merge branch 'lt/objformat'
commit83e12e51c1826b29b5ab2ebcfa13ed99ce98ee98
authorJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 00:38:03 +0000 (24 17:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 25 Jul 2006 00:38:03 +0000 (24 17:38 -0700)
tree6206c5f4081a9514096b01c0cd876477a4900ef8
parent57c7d9a7756f9c0165d0aa003eb8a05c08cd9fae
parent93821bd97aa516b3b557fc5d1b32fd3431536e44
Merge branch 'lt/objformat'

* lt/objformat:
  sha1_file: add the ability to parse objects in "pack file format"
Documentation/config.txt
sha1_file.c