summaryrefslogtreecommitdiffstats
path: root/t/t4301-merge-tree-write-tree.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* builtin/merge-tree: fix leaking `-X` strategy optionsPatrick Steinhardt2024-08-221-0/+1
* t/t4*: avoid redundant uses of catBeat Bolli2024-03-161-4/+4
* Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-0/+12
|\
| * commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-0/+12
* | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-081-0/+33
|\ \ | |/ |/|
| * t4301: verify that merge-tree fails on missing blob objectsJohannes Schindelin2024-02-231-0/+16
| * merge-tree: fail with a non-zero exit code on missing tree objectsJohannes Schindelin2024-02-231-0/+11
| * merge-tree: accept 3 trees as argumentsJohannes Schindelin2024-01-291-0/+6
* | i18n: factorize even more 'incompatible options' messagesRené Scharfe2023-11-271-1/+1
|/
* merge-tree: add -X strategy optionTang Yuyi2023-09-251-0/+23
* *: fix typos which duplicate a wordAndrei Rybak2023-01-081-2/+2
* merge-tree.c: allow specifying the merge-base when --stdin is passedKyle Zhao2022-11-131-0/+35
* merge-tree.c: add --merge-base=<commit> optionKyle Zhao2022-11-131-0/+27
* merge-tree: support multiple batched merges with --stdinElijah Newren2022-10-231-0/+41
* merge-ort: fix segmentation fault in read-only repositoriesJohannes Schindelin2022-09-281-0/+9
* t4301: emit blank line in more idiomatic fashionEric Sunshine2022-08-291-10/+10
* t4301: fix broken &&-chains and add missing loop terminationEric Sunshine2022-08-291-2/+2
* t4301: account for behavior differences between sed implementationsEric Sunshine2022-08-281-1/+1
* t4301: add more interesting merge-tree testcasesElijah Newren2022-08-241-1/+573
* leak tests: mark passing SANITIZE=leak tests as leak-freeÆvar Arnfjörð Bjarmason2022-07-281-0/+1
* merge-tree: add a --allow-unrelated-histories flagElijah Newren2022-06-231-1/+23
* merge-tree: allow `ls-files -u` style info to be NUL terminatedElijah Newren2022-06-231-0/+42
* merge-tree: provide easy access to `ls-files -u` style infoElijah Newren2022-06-231-2/+24
* merge-tree: provide a list of which files have conflictsElijah Newren2022-06-231-0/+11
* merge-tree: support including merge messages in outputElijah Newren2022-06-231-0/+37
* merge-tree: implement real mergesElijah Newren2022-06-231-0/+106
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 00:03:44 +0100