Git 2.20-rc1

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

diff --git a/Documentation/RelNotes/2.20.0.txt b/Documentation/RelNotes/2.20.0.txt
index f6bf3626fbe05add11aafcfd8f87ada709ded466..8e266647f0c4b3a514e1e4e035eb1a760c9f38f9 100644 (file)
--- a/Documentation/RelNotes/2.20.0.txt
+++ b/Documentation/RelNotes/2.20.0.txt
@@ -258,8 +258,8 @@ Performance, Internal Implementation, Development Support etc.
    used during tests are getting renamed for consistency.
    (merge 4231d1ba99 bp/rename-test-env-var later to maint).
 
    used during tests are getting renamed for consistency.
    (merge 4231d1ba99 bp/rename-test-env-var later to maint).
 

- * A new extension to the index file has been introduced, which allows
-   the index file to be read in parallel for performance.
+ * A pair of new extensions to the index file have been introduced.
+   They allow the index file to be read in parallel for performance.

 
  * The oidset API was built on top of the oidmap API which in turn is
    on the hashmap API.  Replace the implementation to build on top of
 
  * The oidset API was built on top of the oidmap API which in turn is
    on the hashmap API.  Replace the implementation to build on top of


@@ -634,6 +634,11 @@ Fixes since v2.19
    used by the diffstat (shown in the cover letter).
    (merge 284aeb7e60 nd/format-patch-cover-letter-stat-width later to maint).
 
    used by the diffstat (shown in the cover letter).
    (merge 284aeb7e60 nd/format-patch-cover-letter-stat-width later to maint).
 

+ * The way .git/index and .git/sharedindex* files were initially
+   created gave these files different perm bits until they were
+   adjusted for shared repository settings.  This was made consistent.
+   (merge c9d6c78870 cc/shared-index-permbits later to maint).
+

  * Code cleanup, docfix, build fix, etc.
    (merge 96a7501aad ts/doc-build-manpage-xsl-quietly later to maint).
    (merge b9b07efdb2 tg/conflict-marker-size later to maint).
  * Code cleanup, docfix, build fix, etc.
    (merge 96a7501aad ts/doc-build-manpage-xsl-quietly later to maint).
    (merge b9b07efdb2 tg/conflict-marker-size later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5aafb91946a1708d566f7f6f86e6a92b727a7342..bc158744221facf88b0d8f4b34d86168036fee65 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.20.0-rc0
+DEF_VER=v2.20.0-rc1

 
 LF='
 '
 
 LF='
 '