Git 2.55-rc2

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

diff --git a/Documentation/RelNotes/2.55.0.adoc b/Documentation/RelNotes/2.55.0.adoc
index 3bf7e4b996ced7f5938eec4555237df64d47eccf..8543cad65e491f740f692edc392b79a4eae7960d 100644 (file)
--- a/Documentation/RelNotes/2.55.0.adoc
+++ b/Documentation/RelNotes/2.55.0.adoc
@@ -221,6 +221,15 @@ Performance, Internal Implementation, Development Support etc.
    checks, and the existing GIT_GNUC_PREREQ macro has been modernized
    to use explicit major/minor comparisons rather than bit-shifting.
 
+ * Wean the Windows builds in GitLab CI procedure away from
+   (unfortunately unreliable) Chocolatey to install dependencies.
+   (merge 0e7b51fed2 ps/gitlab-ci-windows later to maint).
+
+ * Build-fix for 32-bit Windows.
+
+ * Xcode 15 and later has a linker set to complain when the same library
+   archive is listed twice on the command line.  Squelch the annoyance.
+
 
 Fixes since v2.54
 -----------------

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9bcfdb576eaf5bd712cb071496ce6c951955eb6d..04b0a8c70f259a8bb23860143b6c1a0d5ba52c1c 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v2.55.0-rc1
+DEF_VER=v2.55.0-rc2
 
 LF='
 '