Merge branch 'np/pack'
commitcc93020f5213b589ff1e512185c47d8c38a4b994
authorJunio C Hamano <junkio@cox.net>
Sun, 20 May 2007 09:18:43 +0000 (20 02:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 20 May 2007 09:18:43 +0000 (20 02:18 -0700)
tree8579bcd4fb9b969cfebb835c1ddabcff0b388d67
parenta0f5b7f0170629107a4aa37a6485cf1263d2b802
parent726f852b0ed7e03e88c419a9996c3815911c9db1
Merge branch 'np/pack'

* np/pack:
  deprecate the new loose object header format
  make "repack -f" imply "pack-objects --no-reuse-object"
  allow for undeltified objects not to be reused
Documentation/config.txt
cache.h
config.c
sha1_file.c