From 7f4e64169352e03476b0ea64e7e2973669e491a2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 21 Nov 2018 23:24:52 +0900 Subject: [PATCH] Git 2.20-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.20.0.txt | 9 +++++++-- GIT-VERSION-GEN | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.20.0.txt b/Documentation/RelNotes/2.20.0.txt index f6bf3626fb..8e266647f0 100644 --- 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). - * 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 @@ -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). + * 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). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 5aafb91946..bc15874422 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.20.0-rc0 +DEF_VER=v2.20.0-rc1 LF=' ' -- 2.11.4.GIT