[pull] master from git:master - #185

Merged

pull[bot] merged 30 commits into

turkdevops:masterfrom

Mar 28, 2026

Commits on Mar 16, 2026

apply.c: fix -p argument parsing

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

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

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

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

LemmingAvalanche
authored and
gitster
committed
3718226

Commits on Mar 17, 2026

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

peijianju
authored and
gitster
committed
60d8c1e

Commits on Mar 18, 2026

use commit_stack instead of prio_queue in LIFO mode

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

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

gabldotink
authored and
gitster
committed
fc8a4f1

Commits on Mar 19, 2026

Introduce new "tools/" directory

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

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

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

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

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

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

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

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

Commits on Mar 20, 2026

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

peff
authored and
gitster
committed
598f40c

Commits on Mar 27, 2026

Merge branch 'jk/diff-highlight-identical-pairs'
gitster
committed
ebd8fa7
Merge branch 'ps/build-tweaks'
gitster
committed
d1f07dd
Merge branch 'rs/prio-queue-to-commit-stack'
gitster
committed
968e62c
Merge branch 'mr/merge-file-object-id-worktree-fix'
gitster
committed
828988b
Merge branch 'gi/doc-boolean-config-typofix'
gitster
committed
f230544
Merge branch 'mf/apply-p-no-atoi'
gitster
committed
cb77c3a
Merge branch 'ej/ref-transaction-hook-preparing'
gitster
committed
ae55b12
Merge branch 'kh/doc-interpret-trailers-1'
gitster
committed
18396dc
Merge branch 'jc/rerere-modern-strbuf-handling'
gitster
committed
7241be4
The 22nd batch
gitster
committed
5361983