summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | The eighth batchJunio C Hamano2021-02-121-0/+21
* | | | | | Merge branch 'tb/precompose-prefix-too'Junio C Hamano2021-02-1211-29/+59
|\ \ \ \ \ \
| * | | | | | MacOS: precompose_argv_prefix()Torsten Bögershausen2021-02-0311-29/+59
| |/ / / / /
* | | | | | Merge branch 'jk/complete-branch-force-delete'Junio C Hamano2021-02-122-4/+6
|\ \ \ \ \ \
| * | | | | | doc/git-branch: fix awkward wording for "-c"Jeff King2021-02-031-2/+2
| * | | | | | completion: handle other variants of "branch -m"Jeff King2021-02-031-2/+4
| * | | | | | completion: treat "branch -D" the same way as "branch -d"Jeff King2021-02-021-1/+1
| |/ / / / /
* | | | | | Merge branch 'jv/upload-pack-filter-spec-quotefix'Junio C Hamano2021-02-122-8/+11
|\ \ \ \ \ \
| * | | | | | t5544: clarify 'hook works with partial clone' testJacob Vosmaer2021-02-021-2/+3
| * | | | | | upload-pack.c: fix filter spec quoting bugJacob Vosmaer2021-01-282-8/+10
| |/ / / / /
* | | | | | Merge branch 'tb/pack-revindex-on-disk'Junio C Hamano2021-02-1222-42/+545
|\ \ \ \ \ \
| * | | | | | t5325: check both on-disk and in-memory reverse indexTaylor Blau2021-01-281-0/+23
| * | | | | | pack-revindex: ensure that on-disk reverse indexes are given precedenceTaylor Blau2021-01-253-0/+14
| * | | | | | t: support GIT_TEST_WRITE_REV_INDEXTaylor Blau2021-01-255-1/+13
| * | | | | | t: prepare for GIT_TEST_WRITE_REV_INDEXTaylor Blau2021-01-256-11/+23
| * | | | | | Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'Taylor Blau2021-01-251-0/+7
| * | | | | | builtin/pack-objects.c: respect 'pack.writeReverseIndex'Taylor Blau2021-01-252-0/+20
| * | | | | | builtin/index-pack.c: write reverse indexesTaylor Blau2021-01-253-8/+131
| * | | | | | builtin/index-pack.c: allow stripping arbitrary extensionsTaylor Blau2021-01-251-8/+8
| * | | | | | pack-write.c: prepare to write 'pack-*.rev' filesTaylor Blau2021-01-252-1/+123
| * | | | | | packfile: prepare for the existence of '*.rev' filesTaylor Blau2021-01-258-14/+184
* | | | | | | Merge branch 'ab/tests-various-fixup'Junio C Hamano2021-02-125-67/+80
|\ \ \ \ \ \ \
| * | | | | | | rm tests: actually test for SIGPIPE in SIGPIPE testÆvar Arnfjörð Bjarmason2021-01-231-2/+14
| * | | | | | | archive tests: use a cheaper "zipinfo -h" invocation to get headerÆvar Arnfjörð Bjarmason2021-01-231-1/+2
| * | | | | | | upload-pack tests: avoid a non-zero "grep" exit statusÆvar Arnfjörð Bjarmason2021-01-231-1/+2
| * | | | | | | git-svn tests: rewrite brittle tests to use "--[no-]merges".Jeff King2021-01-231-7/+3
| * | | | | | | git svn mergeinfo tests: refactor "test -z" to use test_must_be_emptyÆvar Arnfjörð Bjarmason2021-01-231-15/+16
| * | | | | | | git svn mergeinfo tests: modernize redirection & quoting styleÆvar Arnfjörð Bjarmason2021-01-231-8/+8
| * | | | | | | cache-tree tests: explicitly test HEAD and index differencesÆvar Arnfjörð Bjarmason2021-01-231-18/+27
| * | | | | | | cache-tree tests: use a sub-shell with less indirectionÆvar Arnfjörð Bjarmason2021-01-231-10/+5
| * | | | | | | cache-tree tests: remove unused $2 parameterÆvar Arnfjörð Bjarmason2021-01-231-4/+2
| * | | | | | | cache-tree tests: refactor for modern test styleÆvar Arnfjörð Bjarmason2021-01-231-14/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Sync with maintJunio C Hamano2021-02-110-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tb/ci-run-cocci-with-18.04' into maintJunio C Hamano2021-02-111-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'en/merge-ort-perf'Junio C Hamano2021-02-112-1/+94
|\ \ \ \ \ \ \ \
| * | | | | | | | merge-ort: begin performance work; instrument with trace2_region_* callsElijah Newren2021-01-232-0/+65
| * | | | | | | | merge-ort: ignore the directory rename split conflict for nowElijah Newren2021-01-231-1/+12
| * | | | | | | | merge-ort: fix massive leakElijah Newren2021-01-231-0/+17
| * | | | | | | | Merge branch 'en/ort-directory-rename' into en/merge-ort-perfJunio C Hamano2021-01-201-22/+1228
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'en/ort-conflict-handling' into en/merge-ort-perfJunio C Hamano2021-01-141-18/+653
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'en/diffcore-rename' into en/merge-ort-perfJunio C Hamano2021-01-142-131/+192
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'en/ort-directory-rename'Junio C Hamano2021-02-111-19/+811
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | merge-ort: fix a directory rename detection bugElijah Newren2021-01-201-117/+81
| * | | | | | | | | | | merge-ort: process_renames() now needs more defensivenessElijah Newren2021-01-201-5/+21
| * | | | | | | | | | | merge-ort: implement apply_directory_rename_modifications()Elijah Newren2021-01-201-1/+167
| * | | | | | | | | | | merge-ort: add a new toplevel_dir fieldElijah Newren2021-01-201-6/+9
| * | | | | | | | | | | merge-ort: implement handle_path_level_conflicts()Elijah Newren2021-01-201-1/+71
| * | | | | | | | | | | merge-ort: implement check_for_directory_rename()Elijah Newren2021-01-201-1/+66
| * | | | | | | | | | | merge-ort: implement apply_dir_rename() and check_dir_renamed()Elijah Newren2021-01-201-2/+35
| * | | | | | | | | | | merge-ort: implement compute_collisions()Elijah Newren2021-01-201-1/+67