aboutsummaryrefslogtreecommitdiff
path: root/t/t6029-merge-subtree.sh
Commit message (Expand)AuthorAge
* merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-23
* tests: add missing &&Jonathan Nieder2010-11-09
* Extend merge-subtree tests to test -Xsubtree=dir.Avery Pennarun2010-01-17
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-24
* add test_cmp function for test scriptsJeff King2008-03-13
* Improve t6029 to check the real "subtree" caseMiklos Vajna2008-02-29
* Add merge-subtree backJunio C Hamano2008-02-23