Junio C Hamano 937fe0a1f9 Merge branch 'en/merge-recursive-debug' into jch ... * en/merge-recursive-debug: builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm merge-recursive.[ch]: thoroughly debug these merge, sequencer: switch recursive merges over to ort sequencer: switch non-recursive merges over to ort merge-ort: enable diff-algorithms other than histogram builtin/merge-recursive: switch to using merge_ort_generic() checkout: replace merge_trees() with merge_ort_nonrecursive()		2025-04-01 21:37:03 +09:00
..
config	ci: deprecate ci/config/allow-ref script	2023-08-30 15:56:11 -07:00
util	travis-ci: include the trash directories of failed tests in the trace log	2018-08-01 09:59:36 -07:00
check-directional-formatting.bash	ci: unify bash calling convention	2024-07-08 16:23:05 -07:00
check-unsafe-assertions.sh	ci: add build checking for side-effects in assert() calls	2025-03-21 03:32:04 -07:00
check-whitespace.sh	check-whitespace: detect if no base_commit is provided	2024-07-23 09:56:50 -07:00
install-dependencies.sh	ci: exercise credential helpers	2025-02-20 07:49:52 -08:00
install-sdk.ps1	ci: create script to set up Git for Windows SDK	2024-10-09 11:33:04 -07:00
lib.sh	ci: exercise credential helpers	2025-02-20 07:49:52 -08:00
make-test-artifacts.sh	ci(github): use grouping also in the `win-build` job	2022-06-13 09:58:41 -07:00
mount-fileshare.sh	Add a build definition for Azure DevOps	2019-01-29 09:26:46 -08:00
print-test-failures.sh	ci: remove stale code for Azure Pipelines	2025-01-10 09:15:39 -08:00
run-build-and-minimal-fuzzers.sh	fuzz: port fuzz-url-decode-mem from OSS-Fuzz	2024-10-16 18:14:11 -04:00
run-build-and-tests.sh	tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm	2025-04-01 03:17:30 -07:00
run-static-analysis.sh	ci: add build checking for side-effects in assert() calls	2025-03-21 03:32:04 -07:00
run-style-check.sh	ci/style-check: add `RemoveBracesLLVM` in CI job	2024-07-23 09:56:50 -07:00
run-test-slice.sh	ci: use test-tool as unit test runner on Windows	2024-05-06 14:06:35 -07:00
test-documentation.sh	ci: perform build and smoke tests for Meson docs	2025-03-12 10:21:53 -07:00