summaryrefslogtreecommitdiff
path: root/t/t6029-merge-subtree.sh
Commit message (Expand)AuthorAgeFilesLines
* Collect merge-related tests to t64xxElijah Newren2020-08-101-152/+0
* Merge branch 'jk/merge-subtree-heuristics'Junio C Hamano2018-08-171-0/+28
|\
| * score_trees(): fix iteration over trees with missing entriesJeff King2018-08-021-0/+28
* | t6000-t6999: fix broken &&-chainsEric Sunshine2018-07-161-8/+8
|/
* merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-1/+1
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-171-1/+46
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-2/+2
* add test_cmp function for test scriptsJeff King2008-03-131-1/+1
* Improve t6029 to check the real "subtree" caseMiklos Vajna2008-02-291-0/+47
* Add merge-subtree backJunio C Hamano2008-02-231-0/+32