[pull] master from git:master#185

Merged

pull[bot] merged 30 commits intoturkdevops:masterfrom

Mar 28, 2026

Commits on Mar 16, 2026

apply.c: fix -p argument parsing

Mroik
authored and
gitster
committed
doc: interpret-trailers: convert to synopsis style

LemmingAvalanche
authored and
gitster
committed
doc: interpret-trailers: normalize and fill out options

LemmingAvalanche
authored and
gitster
committed
doc: config: convert trailers section to synopsis style

LemmingAvalanche
authored and
gitster
committed
interpret-trailers: use placeholder instead of *

LemmingAvalanche
authored and
gitster
committed

Commits on Mar 17, 2026

refs: add 'preparing' phase to the reference-transaction hook

peijianju
authored and
gitster
committed

Commits on Mar 18, 2026

use commit_stack instead of prio_queue in LIFO mode

rscharfe
authored and
gitster
committed
merge-file: fix BUG when --object-id is used in a worktree

Mortal
authored and
gitster
committed
doc: add missing space on git-config page

gabldotink
authored and
gitster
committed

Commits on Mar 19, 2026

Introduce new "tools/" directory

pks-t
authored and
gitster
committed
contrib: move "coccinelle/" directory into "tools/"

pks-t
authored and
gitster
committed
contrib: move "coverage-diff.sh" script into "tools/"

pks-t
authored and
gitster
committed
contrib: move "update-unicode.sh" script into "tools/"

pks-t
authored and
gitster
committed
builds: move build scripts into "tools/"

pks-t
authored and
gitster
committed
git-compat-util.h: move warning infra to prepare for PCHs

pks-t
authored and
gitster
committed
meson: compile compatibility sources separately

pks-t
authored and
gitster
committed
meson: precompile "git-compat-util.h"

pks-t
authored and
gitster
committed
rerere: update to modern representation of empty strbufs
gitster
committed

Commits on Mar 20, 2026

cocci: strbuf.buf is never NULL
gitster
committed
contrib/diff-highlight: do not highlight identical pairs

peff
authored and
gitster
committed

Commits on Mar 27, 2026