diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:55 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-11 18:34:55 -0800 |
commit | d9f85f50ca35d7ed1b35e2990a0082b94f1e1370 (patch) | |
tree | f1a6b0ec024c4b8d028d6517987e5bcbe087b537 /Documentation/git-merge-file.txt | |
parent | Merge branch 'rs/zip-tests' (diff) | |
parent | archive-zip: write uncompressed size into header even with streaming (diff) | |
download | tgif-d9f85f50ca35d7ed1b35e2990a0082b94f1e1370.tar.xz |
Merge branch 'rs/zip-with-uncompressed-size-in-the-header'
Improve compatibility of our zip output to fill uncompressed size
in the header, which we can do without seeking back (even though it
should not be necessary).
* rs/zip-with-uncompressed-size-in-the-header:
archive-zip: write uncompressed size into header even with streaming
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions