Git 2.55

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 8543cad65e491f740f692edc392b79a4eae7960d..f5643534dcc19ce39b1fed406431911d8895640c 100644 (file)
--- a/Documentation/RelNotes/2.55.0.adoc
+++ b/Documentation/RelNotes/2.55.0.adoc
@@ -31,7 +31,9 @@ UI, Workflows & Features
    subcommand "git url-parse".
 
  * Misspelt proxy URL (e.g., httt://...) did not trigger any warning
-   or failure, which has been corrected.
+   or failure, which has been corrected.  We had a regression in this
+   update that broke https:// proxies, but that has been caught and
+   corrected.
 
  * Document the fact that .git/info/exclude is shared across worktrees
    linked to the same repository.

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