summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2021-07-29t1092: test merge conflicts outside coneLibravatar Derrick Stolee1-0/+43
2021-07-28Merge branch 'ps/t0000-output-directory-fix'Libravatar Junio C Hamano2-2/+14
2021-07-28Merge branch 'tb/reverse-midx'Libravatar Junio C Hamano1-0/+5
2021-07-28Merge branch 'pb/dont-complete-aliased-options'Libravatar Junio C Hamano1-0/+13
2021-07-28Merge branch 'ds/status-with-sparse-index'Libravatar Junio C Hamano2-11/+206
2021-07-28Merge branch 'ab/pkt-line-tests'Libravatar Junio C Hamano5-34/+24
2021-07-28Merge branch 'jk/t0000-subtests-fix'Libravatar Junio C Hamano1-10/+29
2021-07-28Merge branch 'ab/attribute-format'Libravatar Junio C Hamano1-1/+1
2021-07-28Merge branch 'jk/log-decorate-optim'Libravatar Junio C Hamano1-0/+14
2021-07-28Merge branch 'sm/worktree-add-lock'Libravatar Junio C Hamano1-1/+15
2021-07-28Merge branch 'ew/many-alternate-optim'Libravatar Junio C Hamano4-0/+100
2021-07-28Merge branch 'hj/commit-allow-empty-message'Libravatar Junio C Hamano1-1/+1
2021-07-26t4060: remove unused variableLibravatar David Turner1-1/+0
2021-07-26interpolate_path(): allow specifying paths relative to the runtime prefixLibravatar Johannes Schindelin1-0/+8
2021-07-26tests: exercise the RUNTIME_PREFIX featureLibravatar Johannes Schindelin1-0/+18
2021-07-26ref-filter: add %(rest) atomLibravatar ZheNing Hu4-0/+16
2021-07-26ref-filter: --format=%(raw) support --perlLibravatar ZheNing Hu1-2/+17
2021-07-26ref-filter: add %(raw) atomLibravatar ZheNing Hu1-0/+216
2021-07-23merge: apply autostash if merge strategy failsLibravatar Philippe Blain1-0/+8
2021-07-23merge: apply autostash if fast-forward failsLibravatar Philippe Blain1-0/+11
2021-07-23cache-tree: prefetch in partial clone read-treeLibravatar Jonathan Tan1-0/+33
2021-07-22tr2: log parent process nameLibravatar Emily Shaffer3-1/+15
2021-07-22bundle tests: use test_cmp instead of grepLibravatar Ævar Arnfjörð Bjarmason1-13/+53
2021-07-22bundle tests: use ">file" not ": >file"Libravatar Ævar Arnfjörð Bjarmason1-3/+3
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Libravatar Junio C Hamano1-2/+78
2021-07-22Merge branch 'ab/send-email-optim'Libravatar Junio C Hamano1-0/+29
2021-07-22pull: fix handling of multiple headsLibravatar Elijah Newren1-1/+1
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren11-66/+66
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren1-2/+2
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie1-5/+5
2021-07-20t7601: add tests of interactions with multiple merge heads and configLibravatar Elijah Newren1-0/+22
2021-07-20t7601: test interaction of merge/rebase/fast-forward flags and optionsLibravatar Elijah Newren1-0/+182
2021-07-20unpack-trees: resolve sparse-directory/file conflictsLibravatar Derrick Stolee1-12/+12
2021-07-20t1092: document bad 'git checkout' behaviorLibravatar Derrick Stolee1-2/+140
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costLibravatar Elijah Newren1-1/+1
2021-07-20t0000: fix test if run with TEST_OUTPUT_DIRECTORYLibravatar Patrick Steinhardt2-2/+14
2021-07-19multi-pack-index: fix potential segfault without sub-commandLibravatar Taylor Blau1-0/+5
2021-07-19t0000: clear GIT_SKIP_TESTS before running sub-testsLibravatar Jeff King1-10/+29
2021-07-19test-lib-functions: use test-tool for [de]packetize()Libravatar Ævar Arnfjörð Bjarmason5-34/+24
2021-07-16Merge branch 'ds/gender-neutral-doc'Libravatar Junio C Hamano1-1/+0
2021-07-16Merge branch 'jt/partial-clone-submodule-1'Libravatar Junio C Hamano4-0/+68
2021-07-16Merge branch 'dd/test-stdout-count-lines'Libravatar Junio C Hamano3-76/+98
2021-07-16Merge branch 'hn/refs-test-cleanup'Libravatar Junio C Hamano2-8/+6
2021-07-16Merge branch 'ab/mktag-tests'Libravatar Junio C Hamano1-15/+106
2021-07-16Merge branch 'ab/show-branch-tests'Libravatar Junio C Hamano2-70/+149
2021-07-16Merge branch 'ab/fetch-negotiate-segv-fix'Libravatar Junio C Hamano1-0/+16
2021-07-16Merge branch 'tb/midx-use-checksum'Libravatar Junio C Hamano1-0/+13
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Libravatar Junio C Hamano1-0/+175
2021-07-16Merge branch 'en/ort-perf-batch-13'Libravatar Junio C Hamano1-0/+440
2021-07-16Merge branch 'en/ort-perf-batch-12'Libravatar Junio C Hamano1-1/+1