diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-24 15:26:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-24 15:26:14 -0800 |
| commit | 11875561bf29cadc91fe43b7383ae05e4ab112b5 (patch) | |
| tree | 2ba52cbbaa8fc305211434ac4bfc7801ba886c04 /Documentation/merge-strategies.txt | |
| parent | The tenth batch (diff) | |
| parent | commit-graph.c: display correct number of chunks when writing (diff) | |
| download | tgif-11875561bf29cadc91fe43b7383ae05e4ab112b5.tar.xz | |
Merge branch 'ds/chunked-file-api' into tb/reverse-midx
* ds/chunked-file-api:
commit-graph.c: display correct number of chunks when writing
chunk-format: add technical docs
chunk-format: restore duplicate chunk checks
midx: use 64-bit multiplication for chunk sizes
midx: use chunk-format read API
commit-graph: use chunk-format read API
chunk-format: create read chunk API
midx: use chunk-format API in write_midx_internal()
midx: drop chunk progress during write
midx: return success/failure in chunk write methods
midx: add num_large_offsets to write_midx_context
midx: add pack_perm to write_midx_context
midx: add entries to write_midx_context
midx: use context in write_midx_pack_names()
midx: rename pack_info to write_midx_context
commit-graph: use chunk-format write API
chunk-format: create chunk format write API
commit-graph: anonymize data in chunk_write_fn
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions