From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Sep 2022 20:07:08 +0000 (-0700)
Subject: The seventeenth batch
X-Git-Tag: v2.38.0-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be1a02a17ede4082a86dfbfee0f54f345e8b43ac;p=thirdparty%2Fgit.git

The seventeenth batch

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

diff --git a/Documentation/RelNotes/2.38.0.txt b/Documentation/RelNotes/2.38.0.txt
index 91a822e62b..71e1731ddb 100644
--- a/Documentation/RelNotes/2.38.0.txt
+++ b/Documentation/RelNotes/2.38.0.txt
@@ -72,6 +72,9 @@ UI, Workflows & Features
  * The bash prompt (in contrib/) learned to optionally indicate when
    the index is unmerged.
 
+ * "git clone" command learned the "--bundle-uri" option to coordinate
+   with hosting sites the use of pre-prepared bundle files.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -139,6 +142,9 @@ Performance, Internal Implementation, Development Support etc.
  * Test portability improvements.
    (merge 4d1d843be7 mt/rot13-in-c later to maint).
 
+ * The "subcommand" mode is introduced to parse-options API and update
+   the command line parser of Git commands with subcommands.
+
 
 Fixes since v2.37
 -----------------
@@ -296,5 +302,10 @@ Fixes since v2.37
    to 22.04.
    (merge ef46584831 ds/github-actions-use-newer-ubuntu later to maint).
 
+ * The auto-stashed local changes created by "git merge --autostash"
+   was mixed into a conflicted state left in the working tree, which
+   has been corrected.
+   (merge d3a9295ada en/merge-unstash-only-on-clean-merge later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
-   (merge 77b9e85c0f vd/fix-perf-tests later to maint).
\ No newline at end of file
+   (merge 77b9e85c0f vd/fix-perf-tests later to maint).