git, branch master

doc: fix grammar errors in submodule description

2026-04-17T04:22:01Z

6cc6d1b4c699 (Documentation: update add --force option + ignore=all config, 2026-02-06) added text describing both the ignore=none and ignore=all behaviors. The former had minor formatting and grammatical errors, while the latter was a bit garbled. I have tried to tweak the wording on the latter to make it read as I think was intended, and fixed the minor grammatical issues with both as well. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

doc: fix singular/plural mismatch in git-rerere

2026-04-17T04:22:01Z

conflict -> conflicts Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

doc: fix plural agreement in pack.preferBitmapTips

2026-04-17T04:22:01Z

hierarchies -> hierarchy Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

doc: fix self-referential config in sendemail.smtpSSLClientKey

2026-04-17T04:22:01Z

a8215a205141 (send-email: add client certificate options, 2026-03-02) added documentation for sendemail.smtpSSLClientKey that says it works "in conjunction with `sendemail.smtpSSLClientKey`" -- referring to itself. It appears that `sendemail.smtpSSLClientCert` was the intended reference; fix it. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

CodingGuidelines: fix subject-verb agreement

2026-04-17T04:22:00Z

Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

RelNotes/2.54.0: fix typos and grammar

2026-04-17T04:22:00Z

Fix various issues in the release notes -- missing/wrong articles, typo, indentation, quote consistency, and wording improvement or corrections. Other than the indentation fix for "The way combined list-object filter options...", this patch is much easier to view with --color-words. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano

Merge branch 'jk/midx-write-v1-by-default'

2026-04-16T22:43:26Z

As writing version 2 MIDX files by default breaks older versions of Git and its reimplementations, use V2 only when necessary. * jk/midx-write-v1-by-default: MIDX: revert the default version to v1

MIDX: revert the default version to v1

2026-04-16T20:45:53Z

We introduced midx version 2 in b2ec8e90c2 (midx: do not require packs to be sorted in lexicographic order, 2026-02-24) and now write it by default. The rationale was that older versions should ignore the v2 midx and fall back to using the packs (just like we do for other midx errors). Unfortunately this is not the case, as we have a hard die() when we see an unknown midx version. As a result, writing a midx with Git 2.54-rc2 puts the repository into a state that is unusable with Git 2.53. And this midx write may happen behind the scenes as part of normal operations, like fetch. Let's switch back to writing v1 by default to avoid regressing the case where multiple versions of Git are used on the same repository. There is one gotcha, though: the v2 format is required for some new features, like midx compaction, and running "git multi-pack-index compact" will complain when asked to write a v1 index. The user must set midx.version to "2" to make the feature work. So instead of always using v1, we'll base the default on whether the requested feature requires v2. That does mean that running midx compaction will create a repository that can't be read by older versions of Git. But we never do that by default; only people experimenting with the new feature will be affected. We have to adjust the test expectation in t5319, since it will now generate v1 files. And our "auto-select v2" is covered by the tests in t5335, which continue to check that compaction works without having to set midx.version manually (and also explicitly check that asking for v1 with compaction reports the problem). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

codeql: bump actions/cache from 4 to 5

2026-04-15T21:31:40Z

Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v4...v5) updated-dependencies: - dependency-name: actions/cache dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major Originally-authored-by: dependabot[bot] Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Git 2.54-rc2

2026-04-14T13:22:50Z

Signed-off-by: Junio C Hamano