summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-02 13:51:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-02 13:51:13 -0700
commitd4a5d872c05057c415347896bd416006153e4b03 (patch)
tree1719741d8f0743b11c5aa27a73d0e0132fc68b4b /Documentation/merge-options.txt
parentMerge branch 'master' of https://github.com/git-l10n/git-po (diff)
parentindex-v4: document the entry format (diff)
downloadtgif-d4a5d872c05057c415347896bd416006153e4b03.tar.xz
Merge branch 'jc/index-v4'
Trivially shrinks the on-disk size of the index file to save both I/O and checksum overhead. The topic should give a solid base to build on further updates, with the code refactoring in its earlier parts, and the backward compatibility mechanism in its later parts. * jc/index-v4: index-v4: document the entry format unpack-trees: preserve the index file version of original update-index: upgrade/downgrade on-disk index version read-cache.c: write prefix-compressed names in the index read-cache.c: read prefix-compressed names in index on-disk version v4 read-cache.c: move code to copy incore to ondisk cache to a helper function read-cache.c: move code to copy ondisk to incore cache to a helper function read-cache.c: report the header version we do not understand read-cache.c: make create_from_disk() report number of bytes it consumed read-cache.c: allow unaligned mapping of the index file cache.h: hide on-disk index details varint: make it available outside the context of pack
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions