Merge branch 'ds/sparse-index-protections'

Junio C Hamano committed over 5 years ago

Merge branch 'tz/c-locale-output-is-no-more'

Junio C Hamano committed over 5 years ago

Merge branch 'cs/http-use-basic-after-failed-negotiate'

Junio C Hamano committed over 5 years ago

l10n: sv.po: Update Swedish translation (5204t0f0u)

Peter Krefting committed over 5 years ago

merge-ort, diffcore-rename: employ cached renames when possible

Elijah Newren committed over 5 years ago

merge-ort: handle interactions of caching and rename/rename(1to1) cases

Elijah Newren committed over 5 years ago

merge-ort: add helper functions for using cached renames

Elijah Newren committed over 5 years ago

merge-ort: preserve cached renames for the appropriate side

Elijah Newren committed over 5 years ago

merge-ort: avoid accidental API mis-use

Elijah Newren committed over 5 years ago

merge-ort: add code to check for whether cached renames can be reused

Elijah Newren committed over 5 years ago

merge-ort: populate caches of rename detection results

Elijah Newren committed over 5 years ago

merge-ort: add data structures for in-memory caching of rename detection

Elijah Newren committed over 5 years ago

t6429: testcases for remembering renames

Elijah Newren committed over 5 years ago

fast-rebase: write conflict state to working tree, index, and HEAD

Elijah Newren committed over 5 years ago

fast-rebase: change assert() to BUG()

Elijah Newren committed over 5 years ago

Documentation/technical: describe remembering renames optimization

Elijah Newren committed over 5 years ago

doc: explain the use of color.pager

Jeff King committed over 5 years ago

l10n: fix typos in po/TEAMS

Jiang Xin committed over 5 years ago

setup: split "extensions found" messages into singular and plural

Alex Henrie committed over 5 years ago

fetch: improve grammar of "shallow roots" message

Alex Henrie committed over 5 years ago