From 111ef79afe185f8731920569450f6a65320f5d5f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 11 Oct 2017 14:54:04 +0900 Subject: [PATCH 1/1] Git 2.15-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.15.0.txt | 17 +++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt index 7b8eeb52b..748f3c998 100644 --- a/Documentation/RelNotes/2.15.0.txt +++ b/Documentation/RelNotes/2.15.0.txt @@ -99,6 +99,10 @@ UI, Workflows & Features operations in the same repository. The new "--no-optional-locks" option can be passed to Git to disable them. + * "git for-each-ref --format=..." learned a new format element, + %(trailers), to show only the commit log trailer part of the log + message. + Performance, Internal Implementation, Development Support etc. @@ -230,6 +234,11 @@ Performance, Internal Implementation, Development Support etc. throughout the life of the program have been marked with UNLEAK marker to help the leak checkers concentrate on real leaks.. + * Plans for weaning us off of SHA-1 has been documented. + + * A new "oidmap" API has been introduced and oidset API has been + rewritten to use it. + Also contains various documentation updates and code clean-ups. @@ -485,6 +494,9 @@ Fixes since v2.14 there. (merge bea4dbeafd tb/ref-filter-empty-modifier later to maint). + * An ancient bug that made Git misbehave with creation/renaming of + refs has been fixed. + * Other minor doc, test and build updates and code cleanups. (merge f094b89a4d ma/parse-maybe-bool later to maint). (merge 39b00fa4d4 jk/drop-sha1-entry-pos later to maint). @@ -516,3 +528,8 @@ Fixes since v2.14 (merge a9155c50bd sb/branch-avoid-repeated-strbuf-release later to maint). (merge f777623514 ks/branch-tweak-error-message-for-extra-args later to maint). (merge 33f3c683ec ks/verify-filename-non-option-error-message-tweak later to maint). + (merge b3ea7dd32d jk/sha1-loose-object-info-fix later to maint). + (merge 2720f6db5d rs/fsck-null-return-from-lookup later to maint). + (merge 99b7b687a6 rs/rs-mailmap later to maint). + (merge 7823655082 tb/complete-describe later to maint). + (merge 7cbbf9d6a2 ls/filter-process-delayed later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index ab04c977b..0e88e2365 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.15.0-rc0 +DEF_VER=v2.15.0-rc1 LF=' ' -- 2.11.0