aboutsummaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
Commit message (Expand)AuthorAge
* reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-06
* reset: add test cases for "--keep" optionChristian Couder2010-01-24
* "reset --merge": fix unmerged caseJunio C Hamano2010-01-03
* reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-03
* reset: add a few tests for "git reset --merge"Christian Couder2009-12-30