summaryrefslogtreecommitdiff
path: root/t/t6029-merge-subtree.sh
AgeCommit message (Expand)Author
2018-08-17Merge branch 'jk/merge-subtree-heuristics'Junio C Hamano
2018-08-02score_trees(): fix iteration over trees with missing entriesJeff King
2018-07-16t6000-t6999: fix broken &&-chainsEric Sunshine
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano
2010-11-09tests: add missing &&Jonathan Nieder
2010-01-18Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2008-03-13add test_cmp function for test scriptsJeff King
2008-02-29Improve t6029 to check the real "subtree" caseMiklos Vajna
2008-02-23Add merge-subtree backJunio C Hamano