Merge branch 'ka/want-ref-in-namespace'

Junio C Hamano committed almost 5 years ago

Merge branch 'zh/cherry-pick-advice'

Junio C Hamano committed almost 5 years ago

Merge branch 'js/advise-when-skipping-cherry-picked'

Junio C Hamano committed almost 5 years ago

pack-objects: rename .idx files into place after .bitmap files

Ævar Arnfjörð Bjarmason committed almost 5 years ago

pack-write: split up finish_tmp_packfile() function

Ævar Arnfjörð Bjarmason committed almost 5 years ago

builtin/index-pack.c: move `.idx` files into place last

Taylor Blau committed almost 5 years ago

index-pack: refactor renaming in final()

Ævar Arnfjörð Bjarmason committed almost 5 years ago

builtin/repack.c: move `.idx` files into place last

Taylor Blau committed almost 5 years ago

pack-write.c: rename `.idx` files after `*.rev`

Taylor Blau committed almost 5 years ago

pack-write: refactor renaming in finish_tmp_packfile()

Ævar Arnfjörð Bjarmason committed almost 5 years ago

bulk-checkin.c: store checksum directly

Taylor Blau committed almost 5 years ago

t5562: use alarm() to interrupt timed child-wait

Jeff King committed almost 5 years ago

refs/files-backend: remove unused open mode parameter

René Scharfe committed almost 5 years ago

setup: use xopen and xdup in sanitize_stdfds

René Scharfe committed almost 5 years ago

pack-bitmap: drop bitmap_index argument from try_partial_reuse()

Jeff King committed almost 5 years ago

pack-bitmap: drop repository argument from prepare_midx_bitmap_git()

Jeff King committed almost 5 years ago

sparse-index: integrate with cherry-pick and rebase

Derrick Stolee committed almost 5 years ago

sequencer: ensure full index if not ORT strategy

Derrick Stolee committed almost 5 years ago

t1092: add cherry-pick, rebase tests

Derrick Stolee committed almost 5 years ago

merge-ort: expand only for out-of-cone conflicts

Derrick Stolee committed almost 5 years ago