summaryrefslogtreecommitdiff
path: root/t/t1005-read-tree-reset.sh
Commit message (Expand)AuthorAgeFilesLines
* t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fixJunio C Hamano2013-11-041-0/+15
* t1005: reindentJunio C Hamano2013-11-041-63/+63
* Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-251-6/+7
* reset --hard/read-tree --reset -u: remove unmerged new pathsJunio C Hamano2008-10-181-0/+60
* add test_cmp function for test scriptsJeff King2008-03-131-1/+1
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-1/+1
* Add a test for read-tree -u --reset with a D/F conflictJeff King2008-03-081-0/+30