summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2021-05-20t6429: testcases for remembering renamesLibravatar Elijah Newren1-0/+692
2021-05-20fast-rebase: write conflict state to working tree, index, and HEADLibravatar Elijah Newren1-19/+32
2021-05-20fast-rebase: change assert() to BUG()Libravatar Elijah Newren1-1/+2
2021-05-04t6423: rename file within directory that other side renamedLibravatar Elijah Newren1-0/+58
2021-03-20Add testing with merge-ort merge strategyLibravatar Elijah Newren1-0/+2
2021-03-20t6423: mark remaining expected failure under merge-ort as suchLibravatar Elijah Newren1-1/+1
2021-03-20t: mark several submodule merging tests as fixed under merge-ortLibravatar Elijah Newren5-9/+22
2021-03-20merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entriesLibravatar Elijah Newren1-2/+2
2021-03-20t6428: new test for SKIP_WORKTREE handling and conflictsLibravatar Elijah Newren1-0/+158
2021-03-10merge-ort: precompute subset of sources for which we need rename detectionLibravatar Elijah Newren1-0/+71
2021-02-15diffcore-rename: guide inexact rename detection based on basenamesLibravatar Elijah Newren1-3/+4
2021-02-15t4001: add a test comparing basename similarity and content similarityLibravatar Elijah Newren1-0/+23
2021-02-10Merge branch 'ab/detox-gettext-tests'Libravatar Junio C Hamano12-101/+20
2021-02-10Merge branch 'ab/grep-pcre-invalid-utf8'Libravatar Junio C Hamano4-7/+60
2021-02-10Merge branch 'ab/retire-pcre1'Libravatar Junio C Hamano2-14/+1
2021-02-10Merge branch 'jk/pretty-lazy-load-commit'Libravatar Junio C Hamano1-1/+1
2021-02-10Merge branch 'ds/more-index-cleanups'Libravatar Junio C Hamano3-2/+344
2021-02-10Merge branch 'rs/worktree-list-verbose'Libravatar Junio C Hamano1-0/+96
2021-02-10Merge branch 'js/rebase-i-commit-cleanup-fix'Libravatar Junio C Hamano1-0/+8
2021-02-10Merge branch 'jk/t0000-cleanups'Libravatar Junio C Hamano1-286/+284
2021-02-10Merge branch 'sg/t7800-difftool-robustify'Libravatar Junio C Hamano1-19/+19
2021-02-05Merge branch 'sg/test-stress-jobs'Libravatar Junio C Hamano1-4/+4
2021-02-05Merge branch 'pb/blame-funcname-range-userdiff'Libravatar Junio C Hamano1-4/+4
2021-02-05Merge branch 'jk/p5303-sed-portability-fix'Libravatar Junio C Hamano1-4/+8
2021-02-05Merge branch 'zh/ls-files-deduplicate'Libravatar Junio C Hamano1-0/+66
2021-02-05Merge branch 'ds/cache-tree-basics'Libravatar Junio C Hamano1-1/+1
2021-02-05Merge branch 'so/log-diff-merge'Libravatar Junio C Hamano5-1/+603
2021-02-03Merge branch 'jk/peel-iterated-oid'Libravatar Junio C Hamano3-28/+3
2021-02-03Merge branch 'ds/maintenance-prefetch-cleanup'Libravatar Junio C Hamano1-1/+32
2021-01-30annotate-tests: quote variable expansions containing path namesLibravatar Johannes Sixt1-4/+4
2021-01-30worktree: teach `list` verbose modeLibravatar Rafael Silva1-0/+31
2021-01-30worktree: teach `list` to annotate prunable worktreeLibravatar Rafael Silva1-0/+32
2021-01-30worktree: teach `list --porcelain` to annotate locked worktreeLibravatar Rafael Silva1-0/+32
2021-01-30t2402: ensure locked worktree is properly cleaned upLibravatar Rafael Silva1-0/+1
2021-01-29p5303: avoid sed GNU-ismLibravatar Jeff King1-4/+8
2021-01-28pretty: lazy-load commit data when expanding user-formatLibravatar Jeff King1-1/+1
2021-01-28rebase -i: do leave commit message intact in fixup! chainsLibravatar Johannes Schindelin1-0/+8
2021-01-28t0000: consistently use single quotes for outer testsLibravatar Jeff King1-190/+190
2021-01-28t0000: run cleaning test inside sub-testLibravatar Jeff King1-8/+17
2021-01-28t0000: run prereq tests inside sub-testLibravatar Jeff King1-80/+69
2021-01-28t0000: keep clean-up tests togetherLibravatar Jeff King1-11/+11
2021-01-26test-lib: prevent '--stress-jobs=X' from being ignoredLibravatar SZEDER Gábor1-4/+4
2021-01-25Merge branch 'ab/mailmap-fixup'Libravatar Junio C Hamano2-14/+21
2021-01-25Merge branch 'ps/config-env-pairs'Libravatar Junio C Hamano1-1/+222
2021-01-25Merge branch 'jx/bundle'Libravatar Junio C Hamano4-24/+511
2021-01-25Merge branch 'ab/mailmap'Libravatar Junio C Hamano6-291/+615
2021-01-25Merge branch 'ps/fetch-atomic'Libravatar Junio C Hamano1-0/+168
2021-01-25Merge branch 'jk/log-cherry-pick-duplicate-patches'Libravatar Junio C Hamano1-0/+12
2021-01-25Merge branch 'js/default-branch-name-tests-final-stretch'Libravatar Junio C Hamano354-3436/+4401
2021-01-25Merge branch 'dl/reflog-with-single-entry'Libravatar Junio C Hamano2-2/+15