From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Mar 2013 19:15:14 +0000 (-0700)
Subject: Merge branch 'nd/doc-index-format'
X-Git-Tag: v1.8.3-rc0~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=865e99b5fde9a9128b34b6f3805f726c7a3b1b13;p=thirdparty%2Fgit.git

Merge branch 'nd/doc-index-format'

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
---

865e99b5fde9a9128b34b6f3805f726c7a3b1b13