aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7110-reset-merge.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-01-03t7110: replace `test -f` with `test_path_is_*` helpersMatteo Bagnolini1-6/+6
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-3/+3
2023-05-23t7110-reset-merge: modernize test formatJohn Cai1-157/+157
2022-07-27leak tests: mark passing SANITIZE=leak tests as leak-freeÆvar Arnfjörð Bjarmason1-0/+1
2021-12-13tests: simplify by dropping unnecessary `for` loopsEric Sunshine1-1/+1
2011-04-13i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110Junio C Hamano1-6/+6
2011-03-09i18n: git-commit "middle of a merge" messageÆvar Arnfjörð Bjarmason1-3/+3
2010-03-06reset: disallow using --keep when there are unmerged entriesChristian Couder1-14/+9
2010-01-24reset: add test cases for "--keep" optionChristian Couder1-1/+118
2010-01-03"reset --merge": fix unmerged caseJunio C Hamano1-9/+31
2010-01-03reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer1-5/+7
2009-12-30reset: add a few tests for "git reset --merge"Christian Couder1-0/+159
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-04 19:12:41 +0000