Merge branch 'ps/config-env-pairs'

Junio C Hamano committed over 5 years ago

Merge branch 'cc/write-promisor-file'

Junio C Hamano committed over 5 years ago

Merge branch 'jx/bundle'

Junio C Hamano committed over 5 years ago

Merge branch 'ab/mailmap'

Junio C Hamano committed over 5 years ago

Merge branch 'ps/fetch-atomic'

Junio C Hamano committed over 5 years ago

Merge branch 'jk/log-cherry-pick-duplicate-patches'

Junio C Hamano committed over 5 years ago

Merge branch 'js/default-branch-name-tests-final-stretch'

Junio C Hamano committed over 5 years ago

Merge branch 'dl/reflog-with-single-entry'

Junio C Hamano committed over 5 years ago

Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'

Junio C Hamano committed over 5 years ago

Merge branch 'jc/deprecate-pack-redundant'

Junio C Hamano committed over 5 years ago

Merge branch 'jk/forbid-lf-in-git-url'

Junio C Hamano committed over 5 years ago

Merge branch 'ab/branch-sort'

Junio C Hamano committed over 5 years ago

Merge branch 'en/diffcore-rename'

Junio C Hamano committed over 5 years ago

Merge branch 'ma/more-opaque-lock-file'

Junio C Hamano committed over 5 years ago

Merge branch 'en/merge-ort-3'

Junio C Hamano committed over 5 years ago

Merge branch 'ab/mktag'

Junio C Hamano committed over 5 years ago

grep/pcre2: better support invalid UTF-8 haystacks

Ævar Arnfjörð Bjarmason committed over 5 years ago

grep/pcre2 tests: don't rely on invalid UTF-8 data test

Ævar Arnfjörð Bjarmason committed over 5 years ago

merge-ort: begin performance work; instrument with trace2_region_* calls

Elijah Newren committed over 5 years ago

merge-ort: ignore the directory rename split conflict for now

Elijah Newren committed over 5 years ago