Hopefully the final batch before 2.48-rc1

Let's wait for git-gui, gitk, and possibly po/ and delay the tagging
of the -rc1.  Many people are already offline for the end-of-year
holidays and it is a slow week, and 'master' front has too many new
things graduated from 'next' a bit too early for me to feel
comfortable.

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 cc752d5466f4efdc2f1a62ee8293e8456e2e9abd..33c11e742f7105f82f1a01879aede03864ca0a1d 100644 (file)
--- a/Documentation/RelNotes/2.48.0.txt
+++ b/Documentation/RelNotes/2.48.0.txt
@@ -35,6 +35,10 @@ UI, Workflows & Features
  * "git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
    tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".
 
+ * "git range-diff" learned to optionally show and compare merge
+   commits in the ranges being compared, with the --diff-merges
+   option.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -141,6 +145,22 @@ Performance, Internal Implementation, Development Support etc.
 
  * Build procedure update plus introduction of Meson based builds.
 
+ * Recent reftable updates mistook a NULL return from a request for
+   0-byte allocation as OOM and died unnecessarily, which has been
+   corrected.
+
+ * Reftable backend adds check for upper limit of log's update_index.
+
+ * Start working to make the codebase buildable with -Wsign-compare.
+
+ * Regression fix for 'show-index' when run outside of a repository.
+
+ * The meson-build procedure is integrated into CI to catch and
+   prevent bitrotting.
+
+ * "git refs migrate" learned to also migrate the reflog data across
+   backends.
+
 
 Fixes since v2.47
 -----------------
@@ -280,6 +300,13 @@ Fixes since v2.47
    the revision walker, which has become unnecessary.
    (merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint).
 
+ * GitLab CI updates.
+   (merge c6b43f663e ps/ci-gitlab-update later to maint).
+
+ * Code to reuse objects based on bitmap contents have been tightened
+   to avoid race condition even when multiple packs are involved.
+   (merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint).
+
  * 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 497b4e48d20f9d1d20f2db2a3aae2a92316b7ca9..194ec0f9ad32fe99172356f6a04c0e7bef1e1935 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v2.48.0-rc0
+DEF_VER=v2.48.0-rc1
 
 LF='
 '