summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
AgeCommit message (Expand)Author
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano
2011-03-10i18n: git-commit "middle of a merge" messageÆvar Arnfjörð Bjarmason
2010-03-07reset: disallow using --keep when there are unmerged entriesChristian Couder
2010-01-25reset: add test cases for "--keep" optionChristian Couder
2010-01-04"reset --merge": fix unmerged caseJunio C Hamano
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer
2009-12-30reset: add a few tests for "git reset --merge"Christian Couder