[pull] master from git:master - #97

Merged

pull[bot] merged 18 commits into

turkdevops:masterfrom

Aug 29, 2025

Commits on Aug 23, 2025

doc: git-rebase: start with an example

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

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

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

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

jvns
authored and
gitster
committed
3f7f2b0

Commits on Aug 25, 2025

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

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

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

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

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

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

j6t
authored and
gitster
committed
457534d

Commits on Aug 26, 2025

docs: note that extensions.compatobjectformat is incomplete

bk2204
authored and
gitster
committed
716d905

Commits on Aug 28, 2025

Merge branch 'je/doc-rebase'
gitster
committed
e345b77
Merge branch 'js/progress-delay-fix'
gitster
committed
dd2a0d9
Merge branch 'sg/line-log-merge-optim'
gitster
committed
c039684
Merge branch 'jk/fetch-check-graph-objects-fix'
gitster
committed
56072ff
Merge branch 'bc/doc-compat-object-format-not-working'
gitster
committed
2fc90ec
The fourth batch
gitster
committed
42bc224