[pull] master from git:master#63

Merged

pull[bot] merged 36 commits intoMainbaseT:masterfrom

Nov 26, 2025

Commits on Oct 17, 2025

Commits on Nov 6, 2025

Commits on Nov 17, 2025

xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK

wetneb
authored and
gitster
committed
blame: make diff algorithm configurable

wetneb
authored and
gitster
committed
wrapper: simplify xmkstemp()

rscharfe
authored and
gitster
committed
t6429: update comment to mention correct tool

newren
authored and
gitster
committed
merge-ort: remove debugging crud

newren
authored and
gitster
committed
merge-ort: fix failing merges in special corner case

newren
authored and
gitster
committed
wincred: avoid memory corruption

elieux
authored and
gitster
committed
cmake: stop trying to build the reftable and xdiff libraries

dscho
authored and
gitster
committed
mingw: avoid the comma operator

dscho
authored and
gitster
committed

Commits on Nov 18, 2025

ci: bump actions/setup-go from 5 to 6

dscho
authored and
gitster
committed
unit-test: ignore --no-chain-lint

peff
authored and
gitster
committed
ci(windows-meson-test): handle options and output like other test jobs

peff
authored and
gitster
committed
test-mktemp: plug memory and descriptor leaks

peff
authored and
gitster
committed
worktree list: fix column spacing

phillipwood
authored and
gitster
committed
worktree list: quote paths

phillipwood
authored and
gitster
committed

Commits on Nov 20, 2025

win32: return error if SleepConditionVariableCS fails

AZero13
authored and
gitster
committed

Commits on Nov 26, 2025