git, branch v2.51.0-rc2Fork of git SCM with my patches.http://git.kilabit.info/git/atom?h=v2.51.0-rc22025-08-13T14:57:49ZGit 2.51-rc22025-08-13T14:57:49ZJunio C Hamanogitster@pobox.com2025-08-13T14:57:49Zurn:sha1:724518f3884d8707c5f51428ba98c115818229b8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A few hotfixes before -rc22025-08-12T04:30:16ZJunio C Hamanogitster@pobox.com2025-08-12T04:29:57Zurn:sha1:8d2709d075d65ba386a4dac157129ef868c283e5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'rs/merge-compact-summary'2025-08-12T04:30:16ZJunio C Hamanogitster@pobox.com2025-08-12T04:30:16Zurn:sha1:22dd6abc321b49e7c785eb2e1fb6a6a9771dd18c
Hotfix.
* rs/merge-compact-summary:
merge: don't document non-existing --compact-summary argument
Merge branch 'rs/for-each-ref-start-after-marker-fix'2025-08-12T04:30:15ZJunio C Hamanogitster@pobox.com2025-08-12T04:30:15Zurn:sha1:10fa89aadcc022babf0b60e0a67a2d2661af768d
Hotfix.
* rs/for-each-ref-start-after-marker-fix:
for-each-ref: call --start-after argument "marker"
merge: don't document non-existing --compact-summary argument2025-08-10T00:11:19ZRené Scharfel.s.r@web.de2025-08-09T10:00:16Zurn:sha1:ad459fd44cf43fe8e506f9c72c54a69407ffcb13
3a54f5bd5d (merge/pull: add the "--compact-summary" option, 2025-06-12)
added the option --compact-summary to both merge and pull. It takes no
no argument, but for merge it got an argument help string. Remove it,
since it is unnecessary.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
for-each-ref: call --start-after argument "marker"2025-08-10T00:10:39ZRené Scharfel.s.r@web.de2025-08-09T08:29:16Zurn:sha1:51d9ed581f37a27c1060e8ba54303f7aefca9756
dabecb9db2 (for-each-ref: introduce a '--start-after' option,
2025-07-15) added the option --start-after and referred to its argument
as "marker" in documentation and usage string, but not in the option's
short help. Use "marker" there as well for consistency and brevity.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.51-rc12025-08-07T15:48:57ZJunio C Hamanogitster@pobox.com2025-08-07T15:12:53Zurn:sha1:2c2ba49d55ff26c1082b8137b1ec5eeccb4337d1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/2.51.0: improve wording for a couple entries2025-08-07T15:48:49ZPatrick Steinhardtps@pks.im2025-08-07T05:09:25Zurn:sha1:45dea789b0d7852a0dafbd14e3cdf7e518c4d0a3
Improve wording and fix typos for a couple entries part of the Git 2.51
release notes.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jt/archive-zip-deflate-fix'2025-08-07T15:14:38ZJunio C Hamanogitster@pobox.com2025-08-07T15:14:38Zurn:sha1:94c3b34d9de0603fb69fc539b653288e9bd91edf
The deflate codepath in "git archive --format=zip" had a
longstanding bug coming from misuse of zlib API, which has been
corrected.
* jt/archive-zip-deflate-fix:
archive: flush deflate stream until Z_STREAM_END
Merge branch 'dl/squelch-maybe-uninitialized'2025-08-07T15:14:38ZJunio C Hamanogitster@pobox.com2025-08-07T15:14:38Zurn:sha1:aa4fb2485c674ef943767ab00acdfe29a47de601
Squelch false-positive compiler warning.
* dl/squelch-maybe-uninitialized:
t/unit-tests/clar: fix -Wmaybe-uninitialized with -Og
remote: bail early from set_head() if missing remote name