Git 2.48-rc0

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
index 802e9a96e5fcdb8a5a9222d4851f60c9388fe7dc..dc11ce58bebb74d5816366938c292b0c80337dd1 100644 (file)
--- a/Documentation/RelNotes/2.48.0.txt
+++ b/Documentation/RelNotes/2.48.0.txt
@@ -129,6 +129,11 @@ Performance, Internal Implementation, Development Support etc.
 
  * Yet another "pass the repository through the callchain" topic.
 
+ * "git describe" learned to stop digging the history needlessly
+   deeper.
+
+ * Build procedure update plus introduction of Meson based builds.
+
 
 Fixes since v2.47
 -----------------
@@ -243,6 +248,23 @@ Fixes since v2.47
    on the path, which was not documented, which has been corrected.
    (merge bc1a980759 kk/doc-ancestry-path later to maint).
 
+
+ * "git tag" has been taught to refuse to create refs/tags/HEAD
+   as such a tag will be confusing in the context of UI provided by
+   the Git Porcelain commands.
+   (merge bbd445d5ef jc/forbid-head-as-tagname later to maint).
+
+ * The advice messages now tell the newer 'git config set' command to
+   set the advice.token configuration variable to squelch a message.
+   (merge 6c397d0104 bf/explicit-config-set-in-advice-messages later to maint).
+
+ * The syntax ":/<text>" to name the latest commit with the matching
+   text was broken with a recent change, which has been corrected.
+   (merge 0ff919e87a ps/commit-with-message-syntax-fix later to maint).
+
+ * Fix performance regression of a recent "fatten promisor pack with
+   local objects" protection against an unwanted gc.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 77af53f56f aa/t7300-modernize later to maint).
    (merge dcd590a39d bf/t-readme-mention-reftable later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b4687784c1c348b6efb110c5e8b935b788723f59..de0e63bdfbac263884e2ea328cc2ef11ace7a238 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v2.47.GIT
+DEF_VER=v2.48.0-rc0
 
 LF='
 '