Git 2.27-rc1

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

diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt
index e3121d01648bfe2a6ec134b14f6dda893f3020cb..5fb8c0cf679aa0d9433f2d8d9066ecb0dc8de179 100644 (file)
--- a/Documentation/RelNotes/2.27.0.txt
+++ b/Documentation/RelNotes/2.27.0.txt
@@ -178,6 +178,11 @@ Performance, Internal Implementation, Development Support etc.
    start_progress() and the stop_progress() calls as a "region" to be
    traced.
 
+ * Instead of downloading Windows SDK for CI jobs for windows builds
+   from an external site (wingit.blob.core.windows.net), use the one
+   created in the windows-build job, to work around quota issues at
+   the external site.
+
 
 Fixes since v2.26
 -----------------
@@ -470,6 +475,15 @@ Fixes since v2.26
    name.  This has been corrected.
    (merge 9068cfb20f rs/fsck-duplicate-names-in-trees later to maint).
 
+ * Code clean-up by removing a compatibility implementation of a
+   function we no longer use.
+   (merge 84b0115f0d cb/no-more-gmtime later to maint).
+
+ * When a binary file gets modified and renamed on both sides of history
+   to different locations, both files would be written to the working
+   tree but both would have the contents from "ours".  This has been
+   corrected so that the path from each side gets their original content.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 564956f358 jc/maintain-doc later to maint).
    (merge 7422b2a0a1 sg/commit-slab-clarify-peek later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 03d2243c0da46bfec319adbd6331b39419b64cfd..165ce7a4a465ab390ce2a012e882fcd3f5e12de8 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.27.0-rc0
+DEF_VER=v2.27.0-rc1
 
 LF='
 '