git, branch nextMirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=next2026-04-17T04:28:09ZSync with 'master'2026-04-17T04:28:09ZJunio C Hamanogitster@pobox.com2026-04-17T04:28:09Zurn:sha1:c7ae2d5bb8f97b06f1b31df2f2456646924c8be7doc: fix grammar errors in submodule description2026-04-17T04:22:01ZElijah Newrennewren@gmail.com2026-04-16T23:36:31Zurn:sha1:e8955061076952cc5eab0300424fc48b601fe12d
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
doc: fix singular/plural mismatch in git-rerere2026-04-17T04:22:01ZElijah Newrennewren@gmail.com2026-04-16T23:36:30Zurn:sha1:60e8015d233a2431e75dcb832dcd5be5368ae452
conflict -> conflicts
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
doc: fix plural agreement in pack.preferBitmapTips2026-04-17T04:22:01ZElijah Newrennewren@gmail.com2026-04-16T23:36:29Zurn:sha1:31f23c958be7f727ece4ce0db8b7ddbf1dfb3f79
hierarchies -> hierarchy
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
doc: fix self-referential config in sendemail.smtpSSLClientKey2026-04-17T04:22:01ZElijah Newrennewren@gmail.com2026-04-16T23:36:28Zurn:sha1:8ecf2a192acd73112341a7b03a3803635c4f49ae
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
CodingGuidelines: fix subject-verb agreement2026-04-17T04:22:00ZElijah Newrennewren@gmail.com2026-04-16T23:36:27Zurn:sha1:39901e77d4543bdc30d6967ea0d162886b7d0fb0
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
RelNotes/2.54.0: fix typos and grammar2026-04-17T04:22:00ZElijah Newrennewren@gmail.com2026-04-16T23:36:26Zurn:sha1:96a659da8a211a2eb8246f225db3c50a15017e68
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with 'master'2026-04-16T22:45:35ZJunio C Hamanogitster@pobox.com2026-04-16T22:45:35Zurn:sha1:1630c3464a2b55d4239f276c7ede0848db06b632Merge branch 'jk/midx-write-v1-by-default'2026-04-16T22:43:26ZJunio C Hamanogitster@pobox.com2026-04-16T22:43:26Zurn:sha1:e60b8306f1fe4bdce1ad66652563565b60b37c00
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
Merge branch 'jk/midx-write-v1-by-default' into next2026-04-16T21:22:30ZJunio C Hamanogitster@pobox.com2026-04-16T21:22:30Zurn:sha1:1b296b0f55885fa8fc649c4b31c37f3d86f3f9cf
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