From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Jul 2023 16:17:53 +0000 (-0700)
Subject: The seventeenth batch
X-Git-Tag: v2.42.0-rc0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee48e70a829d1fa2da82f14787051ad8e7c45b71;p=thirdparty%2Fgit.git

The seventeenth batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes/2.42.0.txt b/Documentation/RelNotes/2.42.0.txt
index e569b044ed..dd73b28d19 100644
--- a/Documentation/RelNotes/2.42.0.txt
+++ b/Documentation/RelNotes/2.42.0.txt
@@ -241,3 +241,6 @@ Fixes since v2.41
    (merge a2dad4868b jc/transport-parseopt-fix later to maint).
    (merge 68cbb20e73 jc/parse-options-show-branch later to maint).
    (merge 3821eb6c3d jc/parse-options-reset later to maint).
+   (merge c48af99a3e bb/trace2-comment-fix later to maint).
+   (merge c95ae3ff9c rs/describe-parseopt-fix later to maint).
+   (merge 36f76d2a25 rs/pack-objects-parseopt-fix later to maint).