summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-11 10:21:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-11 10:21:46 -0700
commit9567a670d2b1f99bfd9547ed186441263b760b17 (patch)
tree0cc871f81ada13521ccc9bf5e7a1bf1c4bf8afd3 /Documentation/git-merge-file.txt
parentThe eleventh batch (diff)
parentt5326: test propagating hashcache values (diff)
downloadtgif-9567a670d2b1f99bfd9547ed186441263b760b17.tar.xz
Merge branch 'tb/midx-write-propagate-namehash'
"git multi-pack-index write --bitmap" learns to propagate the hashcache from original bitmap to resulting bitmap. * tb/midx-write-propagate-namehash: t5326: test propagating hashcache values p5326: generate pack bitmaps before writing the MIDX bitmap p5326: don't set core.multiPackIndex unnecessarily p5326: create missing 'perf-tag' tag midx.c: respect 'pack.writeBitmapHashcache' when writing bitmaps pack-bitmap.c: propagate namehash values from existing bitmaps t/helper/test-bitmap.c: add 'dump-hashes' mode
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions