[pull] master from git:master#144

Merged

pull[bot] merged 23 commits intoturkdevops:masterfrom

Dec 22, 2025

Commits on Dec 11, 2025

odb: refactor parsing of alternates to be self-contained

pks-t
authored and
gitster
committed
odb: resolve relative alternative paths when parsing

pks-t
authored and
gitster
committed
odb: move computation of normalized objdir into `alt_odb_usable()`

pks-t
authored and
gitster
committed
odb: stop splitting alternate in `odb_add_to_alternates_file()`

pks-t
authored and
gitster
committed
odb: remove mutual recursion when parsing alternates

pks-t
authored and
gitster
committed
odb: drop forward declaration of `read_info_alternates()`

pks-t
authored and
gitster
committed
odb: read alternates via sources

pks-t
authored and
gitster
committed
odb: write alternates via sources

pks-t
authored and
gitster
committed

Commits on Dec 14, 2025

t4014: support Git version strings with spaces

rscharfe
authored and
gitster
committed
doc: replay: mention no output on conflicts

LemmingAvalanche
authored and
gitster
committed
replay: improve --contained and add to doc

LemmingAvalanche
authored and
gitster
committed
doc: replay: link section using markup

LemmingAvalanche
authored and
gitster
committed