summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-07-20merge-ort: avoid recursing into directories when we don't need toLibravatar Elijah Newren1-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedLibravatar Elijah Newren1-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionLibravatar Elijah Newren1-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesLibravatar Elijah Newren1-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Libravatar Elijah Newren1-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationLibravatar Elijah Newren1-0/+37
2021-07-16The fifth batchLibravatar Junio C Hamano1-0/+29
2021-07-16Merge branch 'ds/gender-neutral-doc'Libravatar Junio C Hamano11-16/+14
2021-07-16Merge branch 'jt/partial-clone-submodule-1'Libravatar Junio C Hamano14-82/+196
2021-07-16Merge branch 'ab/struct-init'Libravatar Junio C Hamano29-64/+76
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 'rs/khash-alloc-cleanup'Libravatar Junio C Hamano1-9/+5
2021-07-16Merge branch 'ar/help-micro-cleanup'Libravatar Junio C Hamano1-9/+8
2021-07-16Merge branch 'ar/submodule-helper-include-cleanup'Libravatar Junio C Hamano1-1/+0
2021-07-16Merge branch 'ab/bundle-updates'Libravatar Junio C Hamano4-65/+104
2021-07-16Merge branch 'hn/refs-iterator-peel-returns-boolean'Libravatar Junio C Hamano4-3/+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 Hamano3-73/+155
2021-07-16Merge branch 'ab/fetch-negotiate-segv-fix'Libravatar Junio C Hamano5-8/+38
2021-07-16Merge branch 'ab/make-delete-on-error'Libravatar Junio C Hamano1-11/+18
2021-07-16Merge branch 'ew/mmap-failures'Libravatar Junio C Hamano5-5/+22
2021-07-16Merge branch 'js/config-mak-windows-pcre-fix'Libravatar Junio C Hamano1-1/+1
2021-07-16Merge branch 'js/gfw-system-config-loc-fix'Libravatar Junio C Hamano3-7/+21
2021-07-16Merge branch 'ks/submodule-cleanup'Libravatar Junio C Hamano1-7/+7
2021-07-16Merge branch 'tb/midx-use-checksum'Libravatar Junio C Hamano6-18/+52
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Libravatar Junio C Hamano3-7/+193
2021-07-16Merge branch 'en/ort-perf-batch-13'Libravatar Junio C Hamano4-34/+612
2021-07-16Merge branch 'en/ort-perf-batch-12'Libravatar Junio C Hamano3-26/+60
2021-07-13The fourth batchLibravatar Junio C Hamano1-0/+26
2021-07-13Merge branch 'rs/grep-parser-fix'Libravatar Junio C Hamano2-0/+11
2021-07-13Merge branch 'bk/doc-commit-typofix'Libravatar Junio C Hamano1-1/+1
2021-07-13Merge branch 'dc/p4-binary-submit-fix'Libravatar Junio C Hamano1-2/+5
2021-07-13Merge branch 'ab/pre-auto-gc-hook-test'Libravatar Junio C Hamano1-0/+46
2021-07-13Merge branch 'jk/union-merge-binary'Libravatar Junio C Hamano2-4/+24
2021-07-13Merge branch 'mr/cmake'Libravatar Junio C Hamano1-9/+28
2021-07-13Merge branch 'ab/describe-tests-fix'Libravatar Junio C Hamano1-62/+72
2021-07-13Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano14-107/+312
2021-07-13Merge branch 'hn/prep-tests-for-reftable'Libravatar Junio C Hamano18-159/+170
2021-07-13Merge branch 'fc/push-simple-updates-cleanup'Libravatar Junio C Hamano1-59/+34
2021-07-13Merge branch 'fc/push-simple-updates'Libravatar Junio C Hamano2-23/+38
2021-07-13Merge branch 'zh/cat-file-batch-fix'Libravatar Junio C Hamano2-6/+26
2021-07-08The third batchLibravatar Junio C Hamano1-0/+77
2021-07-08Merge branch 'js/stop-exporting-bogus-columns'Libravatar Junio C Hamano1-3/+13
2021-07-08Merge branch 'dd/document-log-decorate-default'Libravatar Junio C Hamano1-1/+3
2021-07-08Merge branch 'ar/test-code-cleanup'Libravatar Junio C Hamano7-8/+8
2021-07-08Merge branch 'ba/object-info'Libravatar Junio C Hamano1-1/+1
2021-07-08Merge branch 'ab/progress-cleanup'Libravatar Junio C Hamano1-6/+3
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Libravatar Junio C Hamano1-14/+8
2021-07-08Merge branch 'ms/mergetools-kdiff3-on-windows'Libravatar Junio C Hamano1-0/+9