summaryrefslogtreecommitdiff
path: root/t/t7110-reset-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-13tests: simplify by dropping unnecessary `for` loopsLibravatar Eric Sunshine1-1/+1
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Libravatar Junio C Hamano1-6/+6
2011-03-09i18n: git-commit "middle of a merge" messageLibravatar Ævar Arnfjörð Bjarmason1-3/+3
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