summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/lsan-race-with-barrier'Junio C Hamano2025-01-016-3/+40
|\
| * grep: work around LSan threading race with barrierJeff King2024-12-301-0/+8
| * index-pack: work around LSan threading race with barrierJeff King2024-12-301-0/+6
| * thread-utils: introduce optional barrier typeJeff King2024-12-303-0/+25
| * Revert "index-pack: spawn threads atomically"Jeff King2024-12-301-2/+0
| * test-lib: use individual lsan dir for --stress runsJeff King2024-12-301-1/+1
* | Merge branch 'ps/weak-sha1-for-tail-sum-fix'Junio C Hamano2025-01-013-2/+3
|\ \
| * | ci: exercise unsafe OpenSSL backendPatrick Steinhardt2024-12-301-0/+1
| * | builtin/fast-import: fix segfault with unsafe SHA1 backendPatrick Steinhardt2024-12-301-1/+1
| * | bulk-checkin: fix segfault with unsafe SHA1 backendPatrick Steinhardt2024-12-301-1/+1
* | | Merge branch 'rs/reftable-realloc-errors'Junio C Hamano2025-01-019-36/+116
|\ \ \
| * | | t-reftable-merged: handle realloc errorsRené Scharfe2024-12-281-2/+2
| * | | reftable: handle realloc error in parse_names()René Scharfe2024-12-281-1/+2
| * | | reftable: fix allocation count on realloc errorRené Scharfe2024-12-283-21/+55
| * | | reftable: avoid leaks on realloc errorRené Scharfe2024-12-287-16/+61
* | | | Git 2.48-rc1v2.48.0-rc1Junio C Hamano2024-12-301-0/+3
* | | | Merge branch 'ms/t7611-test-path-is-file'Junio C Hamano2024-12-301-17/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | t7611: replace test -f with test_path_is* helpersMeet Soni2024-12-271-17/+17
| |/ /
* | | Merge branch 'ps/meson-test-wo-gitweb'Junio C Hamano2024-12-286-135/+147
|\ \ \
| * | | meson: enable auto-discovered "gitweb"Patrick Steinhardt2024-12-271-2/+2
| * | | GIT-BUILD-OPTIONS: wire up NO_GITWEB optionPatrick Steinhardt2024-12-276-28/+40
| * | | GIT-BUILD-OPTIONS: sort variables alphabeticallyPatrick Steinhardt2024-12-273-105/+105
| |/ /
* | | Merge branch 'as/gitk-git-gui-repo-update'Junio C Hamano2024-12-281-5/+6
|\ \ \ | |/ / |/| |
| * | Update the official repo of gitkAlexander Shopov2024-12-261-5/+6
* | | 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