aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4301-merge-tree-write-tree.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-05-16merge-tree: add a new --quiet flagElijah Newren1-0/+38
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-7/+0
2025-03-18merge-ort: allow rename detection to be disabledElijah Newren1-0/+6
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-08-22builtin/merge-tree: fix leaking `-X` strategy optionsPatrick Steinhardt1-0/+1
2024-03-16t/t4*: avoid redundant uses of catBeat Bolli1-4/+4
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-0/+12
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-0/+33
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-0/+12
2024-02-23t4301: verify that merge-tree fails on missing blob objectsJohannes Schindelin1-0/+16
2024-02-23merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin1-0/+11
2024-01-29merge-tree: accept 3 trees as argumentsJohannes Schindelin1-0/+6
2023-11-27i18n: factorize even more 'incompatible options' messagesRené Scharfe1-1/+1
2023-09-25merge-tree: add -X strategy optionTang Yuyi1-0/+23
2023-01-08*: fix typos which duplicate a wordAndrei Rybak1-2/+2
2022-11-12merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao1-0/+35
2022-11-12merge-tree.c: add --merge-base=<commit> optionKyle Zhao1-0/+27
2022-10-22merge-tree: support multiple batched merges with --stdinElijah Newren1-0/+41
2022-09-28merge-ort: fix segmentation fault in read-only repositoriesJohannes Schindelin1-0/+9
2022-08-29t4301: emit blank line in more idiomatic fashionEric Sunshine1-10/+10
2022-08-29t4301: fix broken &&-chains and add missing loop terminationEric Sunshine1-2/+2
2022-08-28t4301: account for behavior differences between sed implementationsEric Sunshine1-1/+1
2022-08-24t4301: add more interesting merge-tree testcasesElijah Newren1-1/+573
2022-07-27leak tests: mark passing SANITIZE=leak tests as leak-freeÆvar Arnfjörð Bjarmason1-0/+1
2022-06-22merge-tree: add a --allow-unrelated-histories flagElijah Newren1-1/+23
2022-06-22merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren1-0/+42
2022-06-22merge-tree: provide easy access to `ls-files -u` style infoElijah Newren1-2/+24
2022-06-22merge-tree: provide a list of which files have conflictsElijah Newren1-0/+11
2022-06-22merge-tree: support including merge messages in outputElijah Newren1-0/+37
2022-06-22merge-tree: implement real mergesElijah Newren1-0/+106
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-13 08:36:16 +0000