diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:58 -0700 |
| commit | b4583001b4387b454b5afffebb8b350fca291393 (patch) | |
| tree | f85c37a977fc853be5edf4f6999d2f96f767958e /ll-merge.c | |
| parent | Merge branch 'rs/mailinfo-format-flowed' (diff) | |
| parent | pack-bitmap: drop "loaded" flag (diff) | |
| download | tgif-b4583001b4387b454b5afffebb8b350fca291393.tar.xz | |
Merge branch 'jk/pack-objects-with-bitmap-fix'
Hotfix of the base topic.
* jk/pack-objects-with-bitmap-fix:
pack-bitmap: drop "loaded" flag
traverse_bitmap_commit_list(): don't free result
t5310: test delta reuse with bitmaps
bitmap_has_sha1_in_uninteresting(): drop BUG check
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions