summaryrefslogtreecommitdiffstats
path: root/t/t6437-submodule-merge.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: remove command-line-centric submodule message from merge-ortElijah Newren2022-06-231-1/+1
* merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan2021-10-091-0/+3
* t: mark several submodule merging tests as fixed under merge-ortElijah Newren2021-03-201-2/+3
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-8/+8
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* merge tests: expect slight differences in output for recursive vs. ortElijah Newren2020-10-261-4/+21
* Merge branch 'en/merge-tests'Junio C Hamano2020-08-201-2/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+455