summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-11-22 18:39:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-22 18:40:11 -0800
commit5f439a0ecfb4657100ec1e56ef9c6eca963b5a94 (patch)
tree6151d6b20cd52194cb475454e009908f9dd10992
parentMerge branch 'jc/save-restore-terminal-revert' (diff)
downloadtgif-5f439a0ecfb4657100ec1e56ef9c6eca963b5a94.tar.xz
A bit more regression fixes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.35.0.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.35.0.txt b/Documentation/RelNotes/2.35.0.txt
index 3ebc797922..47124fdbd9 100644
--- a/Documentation/RelNotes/2.35.0.txt
+++ b/Documentation/RelNotes/2.35.0.txt
@@ -23,3 +23,12 @@ Fixes since v2.34
* "git pull" with any strategy when the other side is behind us
should succeed as it is a no-op, but doesn't.
+ (merge ea1954af ev/pull-already-up-to-date-is-noop later to maint).
+
+ * An earlier change in 2.34.0 caused JGit application (that abused
+ GIT_EDITOR mechanism when invoking "git config") to get stuck with
+ a SIGTTOU signal; it has been reverted.
+ (merge e3f7e01b50 jc/save-restore-terminal-revert later to maint).
+
+ * An earlier change that broke .gitignore matching has been reverted.
+ (merge 33c5d6c845 ds/add-rm-with-sparse-index later to maint).