From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Oct 2024 21:22:07 +0000 (-0700)
Subject: Start the 2.48 cycle
X-Git-Tag: v2.48.0-rc0~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef8ce8f3d4344fd3af049c17eeba5cd20d98b69f;p=thirdparty%2Fgit.git

Start the 2.48 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes/2.48.0.txt b/Documentation/RelNotes/2.48.0.txt
new file mode 100644
index 0000000000..11d02d09aa
--- /dev/null
+++ b/Documentation/RelNotes/2.48.0.txt
@@ -0,0 +1,35 @@
+Git v2.48 Release Notes
+=======================
+
+UI, Workflows & Features
+------------------------
+
+Performance, Internal Implementation, Development Support etc.
+--------------------------------------------------------------
+
+ * Document "amlog" notes.
+   (merge ddfb5bcfc6 tb/notes-amlog-doc later to maint).
+
+ * The way AsciiDoc is used for SYNOPSIS part of the manual pages has
+   been revamped.  The sources, at least for the simple cases, got
+   vastly pleasant to work with.
+
+ * The reftable library is now prepared to expect that the memory
+   allocation function given to it may fail to allocate and to deal
+   with such an error.
+
+
+Fixes since v2.47
+-----------------
+
+ * Doc update to clarify how periodical maintenance are scheduled,
+   spread across time to avoid thundering hurds.
+   (merge 3d6ab4177d sk/doc-maintenance-schedule later to maint).
+
+ * Use after free and double freeing at the end in "git log -L... -p"
+   had been identified and fixed.
+   (merge fc5589d6c1 ds/line-log-asan-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 66893a14d0 ps/leakfixes-part-8 later to maint).
+   (merge 1164e270b5 jk/output-prefix-cleanup later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b3265f7bec..78e8631f67 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.47.0
+DEF_VER=v2.47.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 0104513a31..061d699283 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.47.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.48.0.txt
\ No newline at end of file