summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-061-14/+9
* reset: add test cases for "--keep" optionChristian Couder2010-01-241-1/+118
* "reset --merge": fix unmerged caseJunio C Hamano2010-01-031-9/+31
* reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-031-5/+7
* reset: add a few tests for "git reset --merge"Christian Couder2009-12-301-0/+159