git/Documentation, branch v2.50.0Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.50.02025-06-13T20:29:15ZHopefully final bits before 2.502025-06-13T20:29:15ZJunio C Hamanogitster@pobox.com2025-06-13T20:28:57Zurn:sha1:f1ca98f609f9a730b9accf24e5558a10a0b41b6c
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'kh/maintenance-missing-tasks-docfix'2025-06-12T21:19:10ZJunio C Hamanogitster@pobox.com2025-06-12T21:19:10Zurn:sha1:9edff09aec9b5aaa3d5528129bb279a4d34cf5b3
Doc mark-up fix for a topic that has graduated to 'master'.
* kh/maintenance-missing-tasks-docfix:
doc: maintenance: fix linkgit syntax
RelNotes/2.50.0: fix typos & other improvements2025-06-11T20:32:14ZKristoffer Haugsbakkcode@khaugsbakk.name2025-06-11T17:35:24Zurn:sha1:1e2677f66fb9e1de2ccaff6e136a3d53ee8d1aed
• Replace with phrases that are more standard (“all-or-nothing”
instead of “-none”)
• Add coordinating words that make it less likely for you to trip
over the sentence (“*that* "gc" can do”)
• Use “SMTP” instead of both SMTP and smtp
• Don’t mention `git fsck --reference` since the previous release
was not affected by this minor bug. Also say “errored out” since
the git-refs(1) bug was there in v2.48.0 as well
• Use the more widespread “linked” instead of “secondary worktree”
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
doc: maintenance: fix linkgit syntax2025-06-09T18:33:25ZKristoffer Haugsbakkcode@khaugsbakk.name2025-06-09T15:59:42Zurn:sha1:6cd0701e3cc9980e4018d0986069cea8837565e3
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.50-rc22025-06-09T14:18:49ZJunio C Hamanogitster@pobox.com2025-06-09T14:17:31Zurn:sha1:4c0e625c091d4c648cec7319bafaed3cc81658e5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A bit more before -rc22025-06-07T17:46:51ZJunio C Hamanogitster@pobox.com2025-06-07T17:46:34Zurn:sha1:8db3019401f8093fb895f581be641fe7e05aa755
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'cf/var-completion-obsd-fixes'2025-06-07T17:46:49ZJunio C Hamanogitster@pobox.com2025-06-07T17:46:49Zurn:sha1:e2e22932cd9c684ab536f662eecb278ed23fe9fe
Build fix for OpenBSD.
* cf/var-completion-obsd-fixes:
completion: make sed command that generates config-list.h portable.
Git 2.50-rc12025-06-03T15:55:24ZJunio C Hamanogitster@pobox.com2025-06-03T15:50:59Zurn:sha1:0bd2d791cc9f745ebaedafc0e1cbebdebe41343e
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'kh/doc-column-markup-fix'2025-06-03T15:55:23ZJunio C Hamanogitster@pobox.com2025-06-03T15:55:23Zurn:sha1:86c32bbee8501310290d146a48a1aea22ce9c779
Doc updates.
* kh/doc-column-markup-fix:
doc: column: fix blank lines around block delimiters
completion: make sed command that generates config-list.h portable.2025-06-03T00:21:49ZCollin Funkcollin.funk1@gmail.com2025-06-02T22:31:32Zurn:sha1:db170e18262ed10e5e9b7f3cbca6a0ac43267b20
The OpenBSD 'sed' command does not support '\n' to represent newlines in
sed expressions. This leads to the follow compiler error:
In file included from builtin/help.c:15:
./config-list.h:282:18: error: use of undeclared identifier 'n'
"gitcvs.dbUser",n "gitcvs.dbPass",
^
1 error generated.
gmake: *** [Makefile:2821: builtin/help.o] Error 1
We can fix this by documenting related configuration variables
one-per-line instead of listing them separated by commas. This allows us
to remove the unportable part of the sed expression in
generate-configlist.sh.
Signed-off-by: Collin Funk <collin.funk1@gmail.com>
Reviewed-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>