diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 00:46:42 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 00:46:42 +0400 |
| commit | f7b1ad870c46c53685ef83efbfd7d9ca1983a191 (patch) | |
| tree | 3d37b13993699ccd8f1bebc1b4b93546da3e9bda /Documentation/technical | |
| parent | 04fe1184fd0611bf26785b365dd344b8f7d72861 (diff) | |
| parent | 7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (diff) | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
bundle: Add colons to list headings in "verify"
bundle: Fix "verify" output if history is complete
Documentation: filter-branch env-filter example
git-filter-branch.txt: clarify ident variables usage
git-compat-util.h: Provide missing netdb.h definitions
describe: Document --match pattern format
Documentation/githooks: Explain pre-rebase parameters
update-index: list supported idx versions and their features
diff-options: unconfuse description of --color
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.txt | 6 |
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 |