[pull] master from git:master#97

Merged

pull[bot] merged 18 commits intoturkdevops:masterfrom

Aug 29, 2025

Commits on Aug 23, 2025

doc: git-rebase: start with an example

jvns
authored and
gitster
committed
doc: git rebase: dedup merge conflict discussion

jvns
authored and
gitster
committed
doc: git rebase: clarify arguments syntax

jvns
authored and
gitster
committed
doc: git-rebase: move --onto explanation down

jvns
authored and
gitster
committed
doc: git-rebase: update discussion of internals

jvns
authored and
gitster
committed

Commits on Aug 25, 2025

line-log: avoid unnecessary tree diffs when processing merge commits

szeder
authored and
gitster
committed
line-log: get rid of the parents array in process_ranges_merge_commit()

szeder
authored and
gitster
committed
line-log: initialize diff queue in process_ranges_ordinary_commit()

szeder
authored and
gitster
committed
line-log: simplify condition checking for merge commits

szeder
authored and
gitster
committed
fetch-pack: re-scan when double-checking graph objects

peff
authored and
gitster
committed
progress: pay attention to (customized) delay time

j6t
authored and
gitster
committed

Commits on Aug 26, 2025

docs: note that extensions.compatobjectformat is incomplete

bk2204
authored and
gitster
committed