From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 23 Jun 2022 10:35:41 +0000 (+0200)
Subject: Git 2.33.4
X-Git-Tag: v2.33.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80c525c4acaf6072697d4bd2a3a5137f91665b55;p=thirdparty%2Fgit.git

Git 2.33.4

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

diff --git a/Documentation/RelNotes/2.33.4.txt b/Documentation/RelNotes/2.33.4.txt
new file mode 100644
index 0000000000..a145cc25de
--- /dev/null
+++ b/Documentation/RelNotes/2.33.4.txt
@@ -0,0 +1,6 @@
+Git v2.33.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.5, v2.31.4
+and v2.32.3 to address the security issue CVE-2022-29187; see
+the release notes for these versions for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 86a3a2870c..473746835b 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.33.3
+DEF_VER=v2.33.4
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 899139d9ec..6cb6ec27dc 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.33.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.33.4.txt
\ No newline at end of file