summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:34:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-11 18:34:55 -0800
commitd9f85f50ca35d7ed1b35e2990a0082b94f1e1370 (patch)
treef1a6b0ec024c4b8d028d6517987e5bcbe087b537 /builtin/merge.c
parentMerge branch 'rs/zip-tests' (diff)
parentarchive-zip: write uncompressed size into header even with streaming (diff)
downloadtgif-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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions