summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* commit-reach: fix index used to loop through unsigned integerPatrick Steinhardt2024-12-271-2/+1
* prio-queue: fix type of `insertion_ctr`Patrick Steinhardt2024-12-271-2/+2
* Merge https://github.com/j6t/git-guiJunio C Hamano2024-12-263-22/+9
|\
| * Merge branch 'js/no-rescan-on-empty-diff'Johannes Sixt2024-12-212-21/+8
| |\
| | * git-gui: Remove forced rescan of stat-dirty files.Johannes Sixt2024-08-032-21/+8
| * | Merge branch 'yk/console-encoding'Johannes Sixt2024-12-091-1/+1
| |\ \
| | * | git-gui: use system encoding to show console outputYuri Konotopov2024-12-081-1/+1
| |/ /
* | | Hopefully the final batch before 2.48-rc1Junio C Hamano2024-12-232-1/+28
* | | Merge branch 'kn/reflog-migration'Junio C Hamano2024-12-237-121/+337
|\ \ \
| * | | refs: mark invalid refname message for translationKarthik Nayak2024-12-201-4/+12
| * | | refs: add support for migrating reflogsKarthik Nayak2024-12-163-52/+115
| * | | refs: allow multiple reflog entries for the same refnameKarthik Nayak2024-12-162-7/+30
| * | | refs: introduce the `ref_transaction_update_reflog` functionKarthik Nayak2024-12-163-12/+65
| * | | refs: add `committer_info` to `ref_transaction_add_update()`Karthik Nayak2024-12-164-10/+18
| * | | refs: extract out refname verification in transactionsKarthik Nayak2024-12-161-14/+23
| * | | refs/files: add count field to ref_lockKarthik Nayak2024-12-161-19/+39
| * | | refs: add `index` field to `struct ref_udpate`Karthik Nayak2024-12-162-2/+18
| * | | refs: include committer info in `ref_update` structKarthik Nayak2024-12-164-11/+27
| * | | Merge branch 'kn/reftable-writer-log-write-verify' into kn/reflog-migrationJunio C Hamano2024-12-163-4/+63
| |\ \ \
* | \ \ \ Merge branch 'ma/asciidoctor-build-fixes'Junio C Hamano2024-12-231-1/+4
|\ \ \ \ \
| * | | | | asciidoctor-extensions.rb.in: inject GIT_DATEMartin Ågren2024-12-211-0/+1
| * | | | | asciidoctor-extensions.rb.in: add missing wordMartin Ågren2024-12-211-1/+1
| * | | | | asciidoctor-extensions.rb.in: delete existing <refmiscinfo/>Martin Ågren2024-12-211-0/+2
| * | | | | Merge branch 'ps/build-hotfix' into ma/asciidoctor-build-fixesJunio C Hamano2024-12-217-45/+90
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ps/build-hotfix'Junio C Hamano2024-12-237-45/+90
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | meson: add options to override build informationPatrick Steinhardt2024-12-203-0/+24
| * | | | | | GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATEPatrick Steinhardt2024-12-202-2/+12
| * | | | | | GIT-VERSION-GEN: fix overriding GIT_VERSIONPatrick Steinhardt2024-12-204-29/+43
| * | | | | | Makefile: introduce template for GIT-VERSION-GENPatrick Steinhardt2024-12-203-5/+13
| * | | | | | Makefile: drop unneeded indirection for GIT-VERSION-GEN outputsPatrick Steinhardt2024-12-202-8/+4
| * | | | | | Makefile: stop including "GIT-VERSION-FILE" in docsPatrick Steinhardt2024-12-201-7/+0
* | | | | | | Merge branch 'ps/ci-meson'Junio C Hamano2024-12-2317-74/+195
|\ \ \ \ \ \ \
| * | | | | | | ci: wire up Meson buildsPatrick Steinhardt2024-12-136-9/+48
| * | | | | | | t: introduce compatibility options to clar-based testsPatrick Steinhardt2024-12-132-1/+30
| * | | | | | | t: fix out-of-tree tests for some git-p4 testsPatrick Steinhardt2024-12-132-50/+50
| * | | | | | | Makefile: detect missing Meson testsPatrick Steinhardt2024-12-131-1/+17
| * | | | | | | meson: detect missing tests at configure timePatrick Steinhardt2024-12-131-0/+36
| * | | | | | | t/unit-tests: rename clar-based unit tests to have a common prefixPatrick Steinhardt2024-12-135-5/+8
| * | | | | | | Makefile: drop -DSUPPRESS_ANNOTATED_LEAKSPatrick Steinhardt2024-12-132-2/+0
| * | | | | | | ci/lib: support custom output directories when creating test artifactsPatrick Steinhardt2024-12-131-6/+6
| * | | | | | | Merge branch 'ps/build' into ps/ci-mesonJunio C Hamano2024-12-1298-511/+4995
| |\| | | | | |
| * | | | | | | Merge branch 'cw/worktree-extension' into ps/ci-mesonJunio C Hamano2024-12-1218-141/+334
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'kl/doc-build-fix'Junio C Hamano2024-12-231-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: remove extra quotes in generated docsKyle Lippincott2024-12-181-3/+3
* | | | | | | | | | Merge branch 'tb/bitmap-fix-pack-reuse'Junio C Hamano2024-12-231-23/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pack-bitmap.c: ensure pack validity for all reuse packsTaylor Blau2024-12-181-23/+18
* | | | | | | | | | | Merge branch 'jk/prio-queue-sign-compare-fix'Junio C Hamano2024-12-233-10/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | prio-queue: use size_t rather than int for sizeJeff King2024-12-203-10/+12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ps/build-meson-gitweb'Junio C Hamano2024-12-232-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | meson: skip gitweb build when Perl is disabledPatrick Steinhardt2024-12-202-2/+13
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |