summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-01-13 21:57:19 +0100
committerJunio C Hamano <gitster@pobox.com>2025-01-13 21:57:19 +0100
commitf93ff170b93a1782659637824b25923245ac9dd1 (patch)
tree809d7245607d77c09eb3fd2a2a45f7592a984a6c
parentSync with Git 2.47.2 (diff)
downloadgit-f93ff170b93a1782659637824b25923245ac9dd1.tar.xz
git-f93ff170b93a1782659637824b25923245ac9dd1.zip
Git 2.48.1v2.48.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.48.1.txt7
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.48.1.txt b/Documentation/RelNotes/2.48.1.txt
new file mode 100644
index 0000000000..26c59b6e3b
--- /dev/null
+++ b/Documentation/RelNotes/2.48.1.txt
@@ -0,0 +1,7 @@
+Git v2.48.1 Release Notes
+=========================
+
+This release merges up the fix that appears in v2.40.4, v2.41.3,
+v2.42.4, v2.43.6, v2.44.3, v2.45.3, v2.46.3, and v2.47.2 to address
+the security issues CVE-2024-50349 and CVE-2024-52006; see the release
+notes for these versions for details.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f2af817fea..570cc11622 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,6 +1,6 @@
#!/bin/sh
-DEF_VER=v2.48.0
+DEF_VER=v2.48.1
LF='
'
diff --git a/RelNotes b/RelNotes
index 061d699283..f28189867b 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.48.0.txt \ No newline at end of file
+Documentation/RelNotes/2.48.1.txt \ No newline at end of file