aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-03-29 12:14:56 -0700
committerJunio C Hamano <gitster@pobox.com>2022-03-29 12:22:03 -0700
commit805e0a68082a217f0112db9ee86a022227a9c81b (patch)
tree26d6f83ca76f3716d85677a52fa4ca51ca961914
parentMerge branch 'jc/rebase-detach-fix' (diff)
downloadgit-805e0a68082a217f0112db9ee86a022227a9c81b.tar.gz
git-805e0a68082a217f0112db9ee86a022227a9c81b.zip
The 16th batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.36.0.txt7
1 files changed, 7 insertions, 0 deletions
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).