summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'ab/detox-config-gettext'Junio C Hamano2021-04-131-15/+1
|\ \ \ \ \ \ \
| * | | | | | | config.c: remove last remnant of GIT_TEST_GETTEXT_POISONÆvar Arnfjörð Bjarmason2021-04-081-15/+1
* | | | | | | | Merge branch 'gk/gitweb-redacted-email'Junio C Hamano2021-04-132-7/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: add "e-mail privacy" feature to redact e-mail addressesGeorgios Kontaxis2021-04-082-7/+38
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'cc/test-helper-bloom-usage-fix'Junio C Hamano2021-04-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | test-bloom: fix missing 'bloom' from usage stringChristian Couder2021-04-051-1/+1
* | | | | | | | | Merge branch 'ab/send-email-validate-errors'Junio C Hamano2021-04-132-25/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-send-email: improve --validate error outputÆvar Arnfjörð Bjarmason2021-04-062-11/+18
| * | | | | | | | | git-send-email: refactor duplicate $? checks into a functionÆvar Arnfjörð Bjarmason2021-04-061-17/+28
| * | | | | | | | | git-send-email: test full --validate outputÆvar Arnfjörð Bjarmason2021-04-061-6/+18
* | | | | | | | | | Merge branch 'tb/precompose-prefix-simplify'Junio C Hamano2021-04-135-16/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | macOS: precompose startup_info->prefixTorsten Bögershausen2021-04-052-11/+19
| * | | | | | | | | | precompose_utf8: make precompose_string_if_needed() publicTorsten Bögershausen2021-04-053-5/+10
* | | | | | | | | | | Merge branch 'fm/user-manual-use-preface'Junio C Hamano2021-04-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | user-manual.txt: assign preface an id and a titleFirmin Martin2021-04-031-0/+3
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/perl-do-not-abuse-map'Junio C Hamano2021-04-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | git-send-email: replace "map" in void context with "for"Ævar Arnfjörð Bjarmason2021-04-021-2/+2
* | | | | | | | | | | Merge branch 'tb/pack-preferred-tips-to-give-bitmap'Junio C Hamano2021-04-139-0/+142
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/pack-objects.c: respect 'pack.preferBitmapTips'Taylor Blau2021-03-315-0/+96
| * | | | | | | | | | | t/helper/test-bitmap.c: initial commitTaylor Blau2021-03-314-0/+27
| * | | | | | | | | | | pack-bitmap: add 'test_bitmap_commits()' helperTaylor Blau2021-03-312-0/+19
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/ref-filter-segfault-fix'Junio C Hamano2021-04-132-1/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | ref-filter: fix NULL check for parse object failureJeff King2021-04-012-1/+11
* | | | | | | | | | | The eighth batchJunio C Hamano2021-04-081-0/+18
* | | | | | | | | | | Merge branch 'ab/make-tags-quiet'Junio C Hamano2021-04-081-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile: add QUIET_GEN to "tags" and "TAGS" targetsÆvar Arnfjörð Bjarmason2021-04-011-4/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/daemon-sanitize-dir-sep'Junio C Hamano2021-04-081-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | daemon: sanitize all directory separatorsRené Scharfe2021-03-261-4/+4
* | | | | | | | | | | | Merge branch 'en/ort-perf-batch-9'Junio C Hamano2021-04-084-15/+354
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | diffcore-rename: avoid doing basename comparisons for irrelevant sourcesElijah Newren2021-03-101-4/+33
| * | | | | | | | | | | merge-ort: skip rename detection entirely if possibleElijah Newren2021-03-101-0/+44
| * | | | | | | | | | | merge-ort: use relevant_sources to filter possible rename sourcesElijah Newren2021-03-101-1/+1
| * | | | | | | | | | | merge-ort: precompute whether directory rename detection is neededElijah Newren2021-03-101-6/+61
| * | | | | | | | | | | merge-ort: introduce wrappers for alternate tree traversalElijah Newren2021-03-101-0/+71
| * | | | | | | | | | | merge-ort: add data structures for an alternate tree traversalElijah Newren2021-03-101-0/+26
| * | | | | | | | | | | merge-ort: precompute subset of sources for which we need rename detectionElijah Newren2021-03-102-3/+103
| * | | | | | | | | | | diffcore-rename: enable filtering possible rename sourcesElijah Newren2021-03-103-7/+21
* | | | | | | | | | | | Merge branch 'en/sequencer-edit-upon-conflict-fix'Junio C Hamano2021-04-084-17/+77
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren2021-03-314-17/+77
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'll/clone-reject-shallow'Junio C Hamano2021-04-0810-6/+108
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | builtin/clone.c: add --reject-shallow optionLi Linchao2021-04-0110-6/+108
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tb/reverse-midx'Junio C Hamano2021-04-0814-68/+733
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | midx.c: improve cache locality in midx_pack_order_cmp()Jeff King2021-04-011-26/+29
| * | | | | | | | | | | pack-revindex: write multi-pack reverse indexesTaylor Blau2021-04-012-0/+116
| * | | | | | | | | | | pack-write.c: extract 'write_rev_file_order'Taylor Blau2021-04-012-11/+26
| * | | | | | | | | | | pack-revindex: read multi-pack reverse indexesTaylor Blau2021-04-015-0/+199
| * | | | | | | | | | | Documentation/technical: describe multi-pack reverse indexesTaylor Blau2021-04-011-0/+83
| * | | | | | | | | | | midx: make some functions non-staticTaylor Blau2021-04-012-2/+4
| * | | | | | | | | | | midx: keep track of the checksumTaylor Blau2021-04-011-1/+2
| * | | | | | | | | | | midx: don't free midx_name earlyTaylor Blau2021-04-011-1/+0