| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2025-05-16 | merge-tree: add a new --quiet flag | Elijah Newren | 1 | -0/+38 |
| 2025-04-08 | tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm | Elijah Newren | 1 | -7/+0 |
| 2025-03-18 | merge-ort: allow rename detection to be disabled | Elijah Newren | 1 | -0/+6 |
| 2024-11-21 | t: remove TEST_PASSES_SANITIZE_LEAK annotations | Patrick Steinhardt | 1 | -1/+0 |
| 2024-08-22 | builtin/merge-tree: fix leaking `-X` strategy options | Patrick Steinhardt | 1 | -0/+1 |
| 2024-03-16 | t/t4*: avoid redundant uses of cat | Beat Bolli | 1 | -4/+4 |
| 2024-03-11 | Merge branch 'js/merge-base-with-missing-commit' | Junio C Hamano | 1 | -0/+12 |
| 2024-03-07 | Merge branch 'js/merge-tree-3-trees' | Junio C Hamano | 1 | -0/+33 |
| 2024-02-29 | commit-reach(repo_get_merge_bases): pass on "missing commits" errors | Johannes Schindelin | 1 | -0/+12 |
| 2024-02-23 | t4301: verify that merge-tree fails on missing blob objects | Johannes Schindelin | 1 | -0/+16 |
| 2024-02-23 | merge-tree: fail with a non-zero exit code on missing tree objects | Johannes Schindelin | 1 | -0/+11 |
| 2024-01-29 | merge-tree: accept 3 trees as arguments | Johannes Schindelin | 1 | -0/+6 |
| 2023-11-27 | i18n: factorize even more 'incompatible options' messages | René Scharfe | 1 | -1/+1 |
| 2023-09-25 | merge-tree: add -X strategy option | Tang Yuyi | 1 | -0/+23 |
| 2023-01-08 | *: fix typos which duplicate a word | Andrei Rybak | 1 | -2/+2 |
| 2022-11-12 | merge-tree.c: allow specifying the merge-base when --stdin is passed | Kyle Zhao | 1 | -0/+35 |
| 2022-11-12 | merge-tree.c: add --merge-base=<commit> option | Kyle Zhao | 1 | -0/+27 |
| 2022-10-22 | merge-tree: support multiple batched merges with --stdin | Elijah Newren | 1 | -0/+41 |
| 2022-09-28 | merge-ort: fix segmentation fault in read-only repositories | Johannes Schindelin | 1 | -0/+9 |
| 2022-08-29 | t4301: emit blank line in more idiomatic fashion | Eric Sunshine | 1 | -10/+10 |
| 2022-08-29 | t4301: fix broken &&-chains and add missing loop termination | Eric Sunshine | 1 | -2/+2 |
| 2022-08-28 | t4301: account for behavior differences between sed implementations | Eric Sunshine | 1 | -1/+1 |
| 2022-08-24 | t4301: add more interesting merge-tree testcases | Elijah Newren | 1 | -1/+573 |
| 2022-07-27 | leak tests: mark passing SANITIZE=leak tests as leak-free | Ævar Arnfjörð Bjarmason | 1 | -0/+1 |
| 2022-06-22 | merge-tree: add a --allow-unrelated-histories flag | Elijah Newren | 1 | -1/+23 |
| 2022-06-22 | merge-tree: allow `ls-files -u` style info to be NUL terminated | Elijah Newren | 1 | -0/+42 |
| 2022-06-22 | merge-tree: provide easy access to `ls-files -u` style info | Elijah Newren | 1 | -2/+24 |
| 2022-06-22 | merge-tree: provide a list of which files have conflicts | Elijah Newren | 1 | -0/+11 |
| 2022-06-22 | merge-tree: support including merge messages in output | Elijah Newren | 1 | -0/+37 |
| 2022-06-22 | merge-tree: implement real merges | Elijah Newren | 1 | -0/+106 |
