Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | The eighth batch | Junio C Hamano | 2021-02-12 | 1 | -0/+21 | |
* | | | | | | Merge branch 'tb/precompose-prefix-too' | Junio C Hamano | 2021-02-12 | 11 | -29/+59 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | MacOS: precompose_argv_prefix() | Torsten Bögershausen | 2021-02-03 | 11 | -29/+59 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'jk/complete-branch-force-delete' | Junio C Hamano | 2021-02-12 | 2 | -4/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | doc/git-branch: fix awkward wording for "-c" | Jeff King | 2021-02-03 | 1 | -2/+2 | |
| * | | | | | | completion: handle other variants of "branch -m" | Jeff King | 2021-02-03 | 1 | -2/+4 | |
| * | | | | | | completion: treat "branch -D" the same way as "branch -d" | Jeff King | 2021-02-02 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'jv/upload-pack-filter-spec-quotefix' | Junio C Hamano | 2021-02-12 | 2 | -8/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | t5544: clarify 'hook works with partial clone' test | Jacob Vosmaer | 2021-02-02 | 1 | -2/+3 | |
| * | | | | | | upload-pack.c: fix filter spec quoting bug | Jacob Vosmaer | 2021-01-28 | 2 | -8/+10 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'tb/pack-revindex-on-disk' | Junio C Hamano | 2021-02-12 | 22 | -42/+545 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | t5325: check both on-disk and in-memory reverse index | Taylor Blau | 2021-01-28 | 1 | -0/+23 | |
| * | | | | | | pack-revindex: ensure that on-disk reverse indexes are given precedence | Taylor Blau | 2021-01-25 | 3 | -0/+14 | |
| * | | | | | | t: support GIT_TEST_WRITE_REV_INDEX | Taylor Blau | 2021-01-25 | 5 | -1/+13 | |
| * | | | | | | t: prepare for GIT_TEST_WRITE_REV_INDEX | Taylor Blau | 2021-01-25 | 6 | -11/+23 | |
| * | | | | | | Documentation/config/pack.txt: advertise 'pack.writeReverseIndex' | Taylor Blau | 2021-01-25 | 1 | -0/+7 | |
| * | | | | | | builtin/pack-objects.c: respect 'pack.writeReverseIndex' | Taylor Blau | 2021-01-25 | 2 | -0/+20 | |
| * | | | | | | builtin/index-pack.c: write reverse indexes | Taylor Blau | 2021-01-25 | 3 | -8/+131 | |
| * | | | | | | builtin/index-pack.c: allow stripping arbitrary extensions | Taylor Blau | 2021-01-25 | 1 | -8/+8 | |
| * | | | | | | pack-write.c: prepare to write 'pack-*.rev' files | Taylor Blau | 2021-01-25 | 2 | -1/+123 | |
| * | | | | | | packfile: prepare for the existence of '*.rev' files | Taylor Blau | 2021-01-25 | 8 | -14/+184 | |
* | | | | | | | Merge branch 'ab/tests-various-fixup' | Junio C Hamano | 2021-02-12 | 5 | -67/+80 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | rm tests: actually test for SIGPIPE in SIGPIPE test | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -2/+14 | |
| * | | | | | | | archive tests: use a cheaper "zipinfo -h" invocation to get header | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -1/+2 | |
| * | | | | | | | upload-pack tests: avoid a non-zero "grep" exit status | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -1/+2 | |
| * | | | | | | | git-svn tests: rewrite brittle tests to use "--[no-]merges". | Jeff King | 2021-01-23 | 1 | -7/+3 | |
| * | | | | | | | git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -15/+16 | |
| * | | | | | | | git svn mergeinfo tests: modernize redirection & quoting style | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -8/+8 | |
| * | | | | | | | cache-tree tests: explicitly test HEAD and index differences | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -18/+27 | |
| * | | | | | | | cache-tree tests: use a sub-shell with less indirection | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -10/+5 | |
| * | | | | | | | cache-tree tests: remove unused $2 parameter | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -4/+2 | |
| * | | | | | | | cache-tree tests: refactor for modern test style | Ævar Arnfjörð Bjarmason | 2021-01-23 | 1 | -14/+14 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Sync with maint | Junio C Hamano | 2021-02-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'tb/ci-run-cocci-with-18.04' into maint | Junio C Hamano | 2021-02-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'en/merge-ort-perf' | Junio C Hamano | 2021-02-11 | 2 | -1/+94 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | merge-ort: begin performance work; instrument with trace2_region_* calls | Elijah Newren | 2021-01-23 | 2 | -0/+65 | |
| * | | | | | | | | merge-ort: ignore the directory rename split conflict for now | Elijah Newren | 2021-01-23 | 1 | -1/+12 | |
| * | | | | | | | | merge-ort: fix massive leak | Elijah Newren | 2021-01-23 | 1 | -0/+17 | |
| * | | | | | | | | Merge branch 'en/ort-directory-rename' into en/merge-ort-perf | Junio C Hamano | 2021-01-20 | 1 | -22/+1228 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf | Junio C Hamano | 2021-01-14 | 1 | -18/+653 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'en/diffcore-rename' into en/merge-ort-perf | Junio C Hamano | 2021-01-14 | 2 | -131/+192 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'en/ort-directory-rename' | Junio C Hamano | 2021-02-11 | 1 | -19/+811 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | merge-ort: fix a directory rename detection bug | Elijah Newren | 2021-01-20 | 1 | -117/+81 | |
| * | | | | | | | | | | | merge-ort: process_renames() now needs more defensiveness | Elijah Newren | 2021-01-20 | 1 | -5/+21 | |
| * | | | | | | | | | | | merge-ort: implement apply_directory_rename_modifications() | Elijah Newren | 2021-01-20 | 1 | -1/+167 | |
| * | | | | | | | | | | | merge-ort: add a new toplevel_dir field | Elijah Newren | 2021-01-20 | 1 | -6/+9 | |
| * | | | | | | | | | | | merge-ort: implement handle_path_level_conflicts() | Elijah Newren | 2021-01-20 | 1 | -1/+71 | |
| * | | | | | | | | | | | merge-ort: implement check_for_directory_rename() | Elijah Newren | 2021-01-20 | 1 | -1/+66 | |
| * | | | | | | | | | | | merge-ort: implement apply_dir_rename() and check_dir_renamed() | Elijah Newren | 2021-01-20 | 1 | -2/+35 | |
| * | | | | | | | | | | | merge-ort: implement compute_collisions() | Elijah Newren | 2021-01-20 | 1 | -1/+67 |