summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2025-04-08Merge branch 'es/meson-build-skip-coccinelle' into kn/meson-hdr-checkJunio C Hamano1-1/+6
2025-04-08builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHMElijah Newren3-20/+1
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren29-862/+236
2025-04-08merge-recursive.[ch]: thoroughly debug theseElijah Newren9-4236/+225
2025-04-08merge, sequencer: switch recursive merges over to ortElijah Newren3-24/+10
2025-04-08sequencer: switch non-recursive merges over to ortElijah Newren1-22/+13
2025-04-08merge-ort: enable diff-algorithms other than histogramElijah Newren3-17/+16
2025-04-08builtin/merge-recursive: switch to using merge_ort_generic()Elijah Newren4-45/+22
2025-04-08checkout: replace merge_trees() with merge_ort_nonrecursive()Elijah Newren1-5/+5
2025-04-08The fourth batchJunio C Hamano1-2/+25
2025-04-08Merge branch 'dk/vimdiff-doc-fix'Junio C Hamano1-1/+1
2025-04-08Merge branch 'fr/vimdiff-layout-fixes'Junio C Hamano1-1/+13
2025-04-08Merge branch 'es/meson-build-skip-coccinelle'Junio C Hamano1-1/+6
2025-04-08Merge branch 'ta/bulk-checkin-signed-compare-false-warning-fix'Junio C Hamano1-10/+6
2025-04-08Merge branch 'rs/clear-commit-marks-simplify'Junio C Hamano1-9/+7
2025-04-08Merge branch 'tb/incremental-midx-part-2'Junio C Hamano10-132/+589
2025-04-08Merge branch 'ps/reftable-sans-compat-util'Junio C Hamano25-1155/+1405
2025-04-08Merge branch 'ps/ci-meson-check-build-docs'Junio C Hamano1-6/+21
2025-04-08Merge branch 'tb/http-curl-keepalive'Junio C Hamano3-16/+84
2025-04-08Merge branch 'tb/refspec-fetch-cleanup'Junio C Hamano6-27/+40
2025-04-08Merge branch 'ms/reftable-block-writer-errors'Junio C Hamano4-46/+56
2025-04-08Merge branch 'en/assert-wo-side-effects'Junio C Hamano11-9/+42
2025-04-08update-ref: add --batch-updates flag for stdin modeKarthik Nayak3-7/+306
2025-04-08refs: support rejection in batch updates during F/D checksKarthik Nayak5-27/+76
2025-04-08refs: implement batch reference update supportKarthik Nayak6-4/+156
2025-04-08refs: introduce enum-based transaction error typesKarthik Nayak7-185/+206
2025-04-08refs/reftable: extract code from the transaction preparationKarthik Nayak1-226/+237
2025-04-08refs/files: remove duplicate duplicates checkKarthik Nayak3-16/+7
2025-04-08refs: move duplicate refname update check to generic layerKarthik Nayak5-114/+51
2025-04-08refs/files: remove redundant check in split_symref_update()Karthik Nayak1-17/+3
2025-04-08builtin/maintenance: introduce "reflog-expire" taskPatrick Steinhardt4-0/+81
2025-04-08builtin/gc: split out function to expire reflog entriesPatrick Steinhardt1-11/+11
2025-04-08builtin/reflog: make functions regarding `reflog_expire_options` publicPatrick Steinhardt3-111/+128
2025-04-08builtin/reflog: stop storing per-reflog expiry dates globallyPatrick Steinhardt2-18/+20
2025-04-08builtin/reflog: stop storing default reflog expiry dates globallyPatrick Steinhardt2-15/+13
2025-04-08reflog: rename `cmd_reflog_expire_cb` to `reflog_expire_options`Patrick Steinhardt3-36/+36
2025-04-07send-email: finer-grained SMTP error handlingZheng Yuting1-3/+29
2025-04-07send-email: capture errors in an eval {} blockZheng Yuting1-14/+25
2025-04-07reftable/table: move printing logic into test helperPatrick Steinhardt4-69/+77
2025-04-07reftable/constants: make block types part of the public interfacePatrick Steinhardt14-117/+131
2025-04-07reftable/table: introduce iterator for table blocksPatrick Steinhardt3-0/+173
2025-04-07reftable/table: add `reftable_table` to the public interfacePatrick Steinhardt2-34/+31
2025-04-07reftable/block: expose a generic iterator over reftable recordsPatrick Steinhardt4-1/+140
2025-04-07reftable/block: make block iterators reseekablePatrick Steinhardt5-35/+48
2025-04-07reftable/block: store block pointer in the block iteratorPatrick Steinhardt2-17/+9
2025-04-07reftable/block: create public interface for reading blocksPatrick Steinhardt4-54/+78
2025-04-07git-zlib: use `struct z_stream_s` instead of typedefPatrick Steinhardt4-9/+7
2025-04-07reftable/block: rename `block_reader` to `reftable_block`Patrick Steinhardt7-166/+172
2025-04-07reftable/block: rename `block` to `block_data`Patrick Steinhardt8-73/+73
2025-04-07reftable/table: move reading block into block readerPatrick Steinhardt4-129/+107