summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2020-10-26t6423, t6436: note improved ort handling with dirty filesLibravatar Elijah Newren2-119/+165
2020-10-26merge tests: expect slight differences in output for recursive vs. ortLibravatar Elijah Newren3-6/+39
2020-10-26t6423: expect improved conflict markers labels in the ort backendLibravatar Elijah Newren1-10/+28
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendLibravatar Elijah Newren2-22/+62
2020-10-26t6416: correct expectation for rename/rename(1to2) + directory/fileLibravatar Elijah Newren1-2/+2
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren6-108/+314
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveLibravatar Elijah Newren6-16/+34
2020-10-16t6423: more involved rules for renaming directories into each otherLibravatar Elijah Newren1-26/+227
2020-10-16t6423: update directory rename detection tests with new ruleLibravatar Elijah Newren1-21/+123
2020-10-16t6423: more involved directory rename testLibravatar Elijah Newren1-0/+195
2020-10-08Merge branch 'js/default-branch-name-part-3'Libravatar Junio C Hamano5-25/+25
2020-10-08Merge branch 'jk/index-pack-hotfixes'Libravatar Junio C Hamano1-0/+7
2020-10-08Merge branch 'hx/push-atomic-with-cert'Libravatar Junio C Hamano1-4/+3
2020-10-08tests: avoid using the branch name `main`Libravatar Johannes Schindelin4-16/+16
2020-10-08t1415: avoid using `main` as ref nameLibravatar Johannes Schindelin1-9/+9
2020-10-07index-pack: restore "resolving deltas" progress meterLibravatar Jeff King1-0/+7
2020-10-06t5534: split stdout and stderr redirectionLibravatar Đoàn Trần Công Danh1-4/+3
2020-10-05Merge branch 'jk/format-auto-base-when-able'Libravatar Junio C Hamano1-0/+22
2020-10-05Merge branch 'jk/diff-cc-oidfind-fix'Libravatar Junio C Hamano1-0/+55
2020-10-05Merge branch 'jk/refspecs-negative'Libravatar Junio C Hamano1-0/+189
2020-10-05Merge branch 'rs/archive-add-file'Libravatar Junio C Hamano2-0/+57
2020-10-05Merge branch 'jt/keep-partial-clone-filter-upon-lazy-fetch'Libravatar Junio C Hamano1-1/+2
2020-10-05Merge branch 'td/submodule-update-quiet'Libravatar Junio C Hamano1-0/+12
2020-10-05Merge branch 'jk/unused'Libravatar Junio C Hamano2-5/+5
2020-10-05Merge branch 'js/default-branch-name-part-2'Libravatar Junio C Hamano10-96/+96
2020-10-05Merge branch 'ds/in-merge-bases-many-optim-bug'Libravatar Junio C Hamano2-0/+32
2020-10-04Merge branch 'jk/shortlog-group-by-trailer'Libravatar Junio C Hamano1-0/+141
2020-10-04Merge branch 'cc/bisect-start-fix'Libravatar Junio C Hamano1-0/+7
2020-10-04Merge branch 'jc/blame-ignore-fix'Libravatar Junio C Hamano1-22/+39
2020-10-02commit-reach: fix in_merge_bases_many bugLibravatar Derrick Stolee2-0/+32
2020-10-01format-patch: teach format.useAutoBase "whenAble" optionLibravatar Jacob Keller1-0/+22
2020-10-01submodule update: silence underlying merge/rebase with "--quiet"Libravatar Theodore Dubois1-0/+12
2020-09-30refspec: add support for negative refspecsLibravatar Jacob Keller1-0/+189
2020-09-30combine-diff: handle --find-object in multitree code pathLibravatar Jeff King1-0/+55
2020-09-30test-advise: check argument count with argc instead of argvLibravatar Jeff King1-2/+2
2020-09-30drop unused argc parametersLibravatar Jeff King1-3/+3
2020-09-29Merge branch 'ah/pull'Libravatar Junio C Hamano1-1/+20
2020-09-29Merge branch 'tg/range-diff-same-file-fix'Libravatar Junio C Hamano1-8/+4
2020-09-29Merge branch 'jc/t1506-rev-parse-leaves-range-endpoint-unpeeled'Libravatar Junio C Hamano1-0/+18
2020-09-29Merge branch 'bc/clone-with-git-default-hash-fix'Libravatar Junio C Hamano1-0/+14
2020-09-29Merge branch 'tb/bloom-improvements'Libravatar Junio C Hamano5-24/+246
2020-09-28fetch: do not override partial clone filterLibravatar Jonathan Tan1-1/+2
2020-09-27shortlog: allow multiple groups to be specifiedLibravatar Jeff King1-0/+74
2020-09-27shortlog: parse trailer identsLibravatar Jeff King1-0/+20
2020-09-27shortlog: de-duplicate trailer valuesLibravatar Jeff King1-0/+28
2020-09-27shortlog: match commit trailers with --groupLibravatar Jeff King1-0/+14
2020-09-27shortlog: add grouping optionLibravatar Jeff King1-0/+5
2020-09-26t9902: avoid using the branch name `master`Libravatar Johannes Schindelin1-5/+5
2020-09-26tests: avoid variations of the `master` branch nameLibravatar Johannes Schindelin7-58/+58
2020-09-25Merge branch 'hx/push-atomic-with-cert'Libravatar Junio C Hamano1-0/+23