summaryrefslogtreecommitdiffstats
path: root/t/t7110-reset-merge.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano2023-11-021-3/+3
* t7110-reset-merge: modernize test formatJohn Cai2023-05-231-157/+157
* leak tests: mark passing SANITIZE=leak tests as leak-freeÆvar Arnfjörð Bjarmason2022-07-281-0/+1
* tests: simplify by dropping unnecessary `for` loopsEric Sunshine2021-12-131-1/+1
* i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano2011-04-141-6/+6
* i18n: git-commit "middle of a merge" messageÆvar Arnfjörð Bjarmason2011-03-101-3/+3
* reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-071-14/+9
* reset: add test cases for "--keep" optionChristian Couder2010-01-251-1/+118
* "reset --merge": fix unmerged caseJunio C Hamano2010-01-041-9/+31
* reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-041-5/+7
* reset: add a few tests for "git reset --merge"Christian Couder2009-12-301-0/+159