Git 2.14-rc0

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

diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt
index 93f06541096a1985bc649e376ea3f6def1050746..60595ba0be8b7f262efac33bd96cd0bc1260da2e 100644 (file)
--- a/Documentation/RelNotes/2.14.0.txt
+++ b/Documentation/RelNotes/2.14.0.txt
@@ -108,6 +108,9 @@ UI, Workflows & Features
  * An old message shown in the commit log template was removed, as it
    has outlived its usefulness.
 
  * An old message shown in the commit log template was removed, as it
    has outlived its usefulness.
 

+ * "git pull --rebase --recurse-submodules" learns to rebase the
+   branch in the submodules to an updated base.
+

 
 Performance, Internal Implementation, Development Support etc.
 
 
 Performance, Internal Implementation, Development Support etc.
 


@@ -217,6 +220,10 @@ Performance, Internal Implementation, Development Support etc.
    object database?" query that is used to derive the length of prefix
    an object name is uniquely abbreviated to.
 
    object database?" query that is used to derive the length of prefix
    an object name is uniquely abbreviated to.
 

+ * The hashmap API has been updated so that data to customize the
+   behaviour of the comparison function can be specified at the time a
+   hashmap is initialized.
+

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


@@ -432,7 +439,7 @@ notes for details).
  * Update the sha1dc again to fix portability glitches.
 
  * Code clean-up to fix possible buffer over-reading.
  * Update the sha1dc again to fix portability glitches.
 
  * Code clean-up to fix possible buffer over-reading.

-   (merge 8bc172e5f2 rs/apply-avoid-over-reading later to maint).
+   (merge 2d105451c0 rs/apply-avoid-over-reading later to maint).

 
  * A few tests that tried to verify the contents of push certificates
    did not use 'git rev-parse' to formulate the line to look for in
 
  * A few tests that tried to verify the contents of push certificates
    did not use 'git rev-parse' to formulate the line to look for in


@@ -445,16 +452,17 @@ notes for details).
    code to walk the reflog of HEAD via "log -g" and friends
    incorrectly stopped at the reflog entry that records the renaming
    of the branch.
    code to walk the reflog of HEAD via "log -g" and friends
    incorrectly stopped at the reflog entry that records the renaming
    of the branch.

-   (merge e30d463d45 jk/reflog-walk-maint later to maint).

 
  * The rewrite of "git branch --list" using for-each-ref's internals
    that happened in v2.13 regressed its handling of color.branch.local;
    this has been fixed.
 
  * The rewrite of "git branch --list" using for-each-ref's internals
    that happened in v2.13 regressed its handling of color.branch.local;
    this has been fixed.

-   (merge 5b5c9c3e19 kn/ref-filter-branch-list later to maint).
+
+ * The build procedure has been improved to allow building and testing
+   Git with address sanitizer more easily.
+   (merge 566cf0b3bd jk/build-with-asan later to maint).

 
  * Other minor doc, test and build updates and code cleanups.
    (merge 3f9c637ec7 pw/unquote-path-in-git-pm later to maint).
 
  * Other minor doc, test and build updates and code cleanups.
    (merge 3f9c637ec7 pw/unquote-path-in-git-pm later to maint).

-   (merge 669638fe7a ks/typofix-commit-c-comment later to maint).

    (merge 5053313562 rs/urlmatch-cleanup later to maint).
    (merge 42c78a216e rs/use-div-round-up later to maint).
    (merge 5e8d2729ae rs/wt-status-cleanup later to maint).
    (merge 5053313562 rs/urlmatch-cleanup later to maint).
    (merge 42c78a216e rs/use-div-round-up later to maint).
    (merge 5e8d2729ae rs/wt-status-cleanup later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4f94fc757459ab40a312144aeaa5648142cbc3a6..8bdf5a367e84037aad8a96e38e9ecb70aa3db6d6 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.13.GIT
+DEF_VER=v2.14.0-rc0

 
 LF='
 '
 
 LF='
 '