Git 2.15-rc0

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

diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt
index face5e0b0236c6f28ffecee61f92693ddc11d7a4..1be62c9e27566e5cbd1581f90569a7cf9c7d923a 100644 (file)
--- a/Documentation/RelNotes/2.15.0.txt
+++ b/Documentation/RelNotes/2.15.0.txt
@@ -219,6 +219,9 @@ Performance, Internal Implementation, Development Support etc.
    pre-parse everything, and an access to a single ref in the
    packed-refs does not touch majority of irrelevant refs, either.
 
    pre-parse everything, and an access to a single ref in the
    packed-refs does not touch majority of irrelevant refs, either.
 

+ * Add comment to clarify that the style file is meant to be used with
+   clang-5 and the rules are still work in progress.
+

 Also contains various documentation updates and code clean-ups.
 
 
 Also contains various documentation updates and code clean-ups.
 
 


@@ -442,6 +445,16 @@ Fixes since v2.14
    correctly, which has been corrected.
    (merge a6304fa4c2 bc/rev-parse-parseopt-fix later to maint).
 
    correctly, which has been corrected.
    (merge a6304fa4c2 bc/rev-parse-parseopt-fix later to maint).
 

+ * The checkpoint command "git fast-import" did not flush updates to
+   refs and marks unless at least one object was created since the
+   last checkpoint, which has been corrected, as these things can
+   happen without any new object getting created.
+   (merge 30e215a65c er/fast-import-dump-refs-on-checkpoint later to maint).
+
+ * Spell the name of our system as "Git" in the output from
+   request-pull script.
+   (merge e66d7c37a5 ar/request-pull-phrasofix later to maint).
+

  * 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).
  * 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).


@@ -465,3 +478,6 @@ Fixes since v2.14
    (merge 0bca165fdb jk/validate-headref-fix later to maint).
    (merge 93dbefb389 mr/doc-negative-pathspec later to maint).
    (merge 5e633326e4 ad/doc-markup-fix later to maint).
    (merge 0bca165fdb jk/validate-headref-fix later to maint).
    (merge 93dbefb389 mr/doc-negative-pathspec later to maint).
    (merge 5e633326e4 ad/doc-markup-fix later to maint).

+   (merge 9ca356fa8b rs/cocci-de-paren-call-params later to maint).
+   (merge 7099153e8d rs/tag-null-pointer-arith-fix later to maint).
+   (merge 0e187d758c rs/run-command-use-alloc-array later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 75beb2e7750f82db233c8365f0ba2223ca4e2486..ab04c977be0cfdb6f282b7911d3fe630d5f70c65 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.14.GIT
+DEF_VER=v2.15.0-rc0

 
 LF='
 '
 
 LF='
 '