From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2022 19:14:56 +0000 (-0700)
Subject: The 16th batch
X-Git-Tag: v2.36.0-rc0~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=805e0a68082a217f0112db9ee86a022227a9c81b;p=thirdparty%2Fgit.git

The 16th batch

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

diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt
index 721b5d2034..c4ca105e3c 100644
--- a/Documentation/RelNotes/2.36.0.txt
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -356,6 +356,13 @@ Fixes since v2.35
    in the current checkout of the superproject.  We now do so for all
    submodules that have been run "git submodule init" on.
 
+ * "git rebase $base $non_branch_commit", when $base is an ancestor or
+   the $non_branch_commit, modified the current branch, which has been
+   corrected.
+
+ * When "shallow" information is updated, we forgot to update the
+   in-core equivalent, which has been corrected.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge cfc5cf428b jc/find-header later to maint).
    (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).