summaryrefslogtreecommitdiff
path: root/t/t6029-merge-subtree.sh
AgeCommit message (Expand)AuthorFilesLines
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano1-1/+1
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2010-01-17Extend merge-subtree tests to test -Xsubtree=dir.Libravatar Avery Pennarun1-1/+46
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-2/+2
2008-03-13add test_cmp function for test scriptsLibravatar Jeff King1-1/+1
2008-02-29Improve t6029 to check the real "subtree" caseLibravatar Miklos Vajna1-0/+47
2008-02-23Add merge-subtree backLibravatar Junio C Hamano1-0/+32