summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-03-17 10:57:52 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-03-24 00:31:36 +0100
commit4d0b43aa765a0056c88381eea862364c95e358ca (patch)
tree499066b83e7704cee40631b33e2f0c75724eb26e
parentSync with 2.33.2 (diff)
downloadtgif-4d0b43aa765a0056c88381eea862364c95e358ca.tar.xz
Git 2.34.2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--Documentation/RelNotes/2.34.2.txt6
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.34.2.txt b/Documentation/RelNotes/2.34.2.txt
new file mode 100644
index 0000000000..0c32cd844b
--- /dev/null
+++ b/Documentation/RelNotes/2.34.2.txt
@@ -0,0 +1,6 @@
+Git v2.34.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3, v2.31.2,
+v2.32.1 and v2.33.2 to address the security issue CVE-2022-24765;
+see the release notes for these versions for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 991308dfaf..81dd339513 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.34.1
+DEF_VER=v2.34.2
LF='
'
diff --git a/RelNotes b/RelNotes
index 30a5e48971..01d62667bf 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.34.1.txt \ No newline at end of file
+Documentation/RelNotes/2.34.2.txt \ No newline at end of file