summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano2011-04-131-6/+6
* i18n: git-commit "middle of a merge" messageÆvar Arnfjörð Bjarmason2011-03-091-3/+3
* 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