Merge branch 'nd/doc-index-format'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:15:14 +0000 (12:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:15:14 +0000 (12:15 -0700)
Update the index format documentation to mention the v4 format.

* nd/doc-index-format:
update-index: list supported idx versions and their features
read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
index-format.txt: mention of v4 is missing in some places

1  2 
Documentation/git-update-index.txt
Documentation/technical/index-format.txt
read-cache.c
Simple merge
Simple merge
diff --cc read-cache.c
Simple merge