summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2010-03-06reset: disallow using --keep when there are unmerged entriesLibravatar Christian Couder1-14/+9
2010-01-24reset: add test cases for "--keep" optionLibravatar Christian Couder1-1/+118
2010-01-03"reset --merge": fix unmerged caseLibravatar Junio C Hamano1-9/+31
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Libravatar Stephan Beyer1-5/+7
2009-12-30reset: add a few tests for "git reset --merge"Libravatar Christian Couder1-0/+159