[pull] master from git:master - #257

Merged

pull[bot] merged 30 commits into

turkdevops:masterfrom

Sep 14, 2026

Commits on Sep 2, 2026

commit: clarify FROM_REBASE_PICK and is_from_rebase() names

newren
authored and
gitster
committed
aef8430
commit: allow a partial commit when a rebase pick becomes empty

newren
authored and
gitster
committed
d692305
commit: reword the empty-commit rebase amend error

newren
authored and
gitster
committed
a383728
commit: refuse to amend during conflict resolution

newren
authored and
gitster
committed
6257588
commit: refuse partial commits during conflict resolution

newren
authored and
gitster
committed
cc499d4
repository: make repo_clear() idempotent

peff
authored and
gitster
committed
95d4895
submodule--helper: free URL when repository setup fails

peff
authored and
gitster
committed
2c03739

Commits on Sep 3, 2026

history: do not dereference NULL when parent tree is missing

wildoranges
authored and
gitster
committed
7662148
pathspec: match and original in pathspec_item are const
gitster
committed
88d06b1

Commits on Sep 6, 2026

doc: git: list gitdatamodel(7) as a concept guide

LemmingAvalanche
authored and
gitster
committed
c655855
doc: git: link to the gitdatamodel(7) tutorial

LemmingAvalanche
authored and
gitster
committed
5745353
doc: glossary: link four of the terms to gitdatamodel(7)

LemmingAvalanche
authored and
gitster
committed
5720c09
doc: datamodel: link to the glossary

LemmingAvalanche
authored and
gitster
committed
ec60248
t3507: check no CHERRY_PICK_HEAD after conflicting --no-commit

lexfrei
authored and
gitster
committed
3e45748
doc: cherry-pick: note --no-commit skips CHERRY_PICK_HEAD

lexfrei
authored and
gitster
committed
81c1e0b

Commits on Sep 7, 2026

fetch-pack: trace packfile URI downloads

tnm-oai
authored and
gitster
committed
7129d77

Commits on Sep 8, 2026

lint-gitlink: don't use empty lower bound in .{0,8}

taahol
authored and
gitster
committed
8a63196

Commits on Sep 10, 2026

doc: fix conjoined maintenance strategies in git-config(1)

brighamcampbell
authored and
gitster
committed
609ea23

Commits on Sep 11, 2026

ci: use system asciidoctor

peff
authored and
gitster
committed
7792e40

Commits on Sep 14, 2026

Merge branch 'jk/ci-use-system-asciidoctor'
gitster
committed
a449fe1
Merge branch 'bc/maintenance-doc-markup-fix-for-asciidoc'
gitster
committed
cee3798
Merge branch 'en/no-amend-during-conflicts'
gitster
committed
a334b7e
Merge branch 'jk/submodule-error-leak'
gitster
committed
830d747
Merge branch 'jc/pathspec-match-const'
gitster
committed
d5cd54c
Merge branch 'tn/fetch-pack-trace-packfile-uri'
gitster
committed
223518f
Merge branch 'kh/doc-datamodel'
gitster
committed
7c051fe
Merge branch 'as/cherry-pick-no-commit-doc'
gitster
committed
994e80a
Merge branch 'jc/history-missing-tree-errorfix'
gitster
committed
d7e8ff8
Merge branch 'ta/lint-gitlink-older-perl-fix'
gitster
committed
584621d
2nd batch for -rc1
gitster
committed
3699d22