summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-03-19 12:15:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-03-19 12:15:14 -0700
commit865e99b5fde9a9128b34b6f3805f726c7a3b1b13 (patch)
treef35be308ff031c12ae41387a4bd6e6773678a96d /Documentation/technical
parentMerge branch 'wk/doc-pre-rebase' (diff)
parentupdate-index: list supported idx versions and their features (diff)
downloadtgif-865e99b5fde9a9128b34b6f3805f726c7a3b1b13.tar.xz
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
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/index-format.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 27c716b15f..0810251f5a 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -12,7 +12,7 @@ Git index format
The signature is { 'D', 'I', 'R', 'C' } (stands for "dircache")
4-byte version number:
- The current supported versions are 2 and 3.
+ The current supported versions are 2, 3 and 4.
32-bit number of index entries.
@@ -93,8 +93,8 @@ Git index format
12-bit name length if the length is less than 0xFFF; otherwise 0xFFF
is stored in this field.
- (Version 3) A 16-bit field, only applicable if the "extended flag"
- above is 1, split into (high to low bits).
+ (Version 3 or later) A 16-bit field, only applicable if the
+ "extended flag" above is 1, split into (high to low bits).
1-bit reserved for future