summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2022-03-17 09:57:44 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2022-03-23 23:31:32 (GMT)
commit87ed4fc046840706138d46e0033a009e74c3887a (patch)
tree12380f4db514255bcbf9f47b9fbe582fb01310c8
parent303b876f76c2caccc9a289c4f14a2b2d3850684e (diff)
downloadgit-2.33.2.zip
git-2.33.2.tar.gz
git-2.33.2.tar.bz2
Git 2.33.2v2.33.2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--Documentation/RelNotes/2.33.2.txt15
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 17 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.33.2.txt b/Documentation/RelNotes/2.33.2.txt
new file mode 100644
index 0000000..e504489
--- /dev/null
+++ b/Documentation/RelNotes/2.33.2.txt
@@ -0,0 +1,15 @@
+Git v2.33.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3, v2.31.2
+and v2.32.1 to address the security issue CVE-2022-24765; see
+the release notes for these versions for details.
+
+In addition, it contains the following fixes:
+
+ * Squelch over-eager warning message added during this cycle.
+
+ * A bug in "git rebase -r" has been fixed.
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+ construct recently, which has been corrected.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 11aac6e..d81eab5 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.33.1
+DEF_VER=v2.33.2
LF='
'
diff --git a/RelNotes b/RelNotes
index 567659e..8e79de2 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.33.1.txt \ No newline at end of file
+Documentation/RelNotes/2.33.2.txt \ No newline at end of file