Git 2.3.0-rc0

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

diff --git a/Documentation/RelNotes/2.3.0.txt b/Documentation/RelNotes/2.3.0.txt
index 7f25bbffbd67b8580305c170eafe529f1a0c88ce..72db8d211fbf94ae94f8f372237b4b1de153b932 100644 (file)
--- a/Documentation/RelNotes/2.3.0.txt
+++ b/Documentation/RelNotes/2.3.0.txt
@@ -74,6 +74,15 @@ UI, Workflows & Features
 
 Performance, Internal Implementation, Development Support etc.
 
+ * Earlier we made "rev-list --object-edge" more aggressively list the
+   objects at the edge commits, in order to reduce number of objects　
+   fetched into a shallow repository, but the change affected cases
+   other than "fetching into a shallow repository" and made it
+   unusably slow (e.g. fetching into a normal repository should not
+   have to suffer the overhead from extra processing).  Limit it to a
+   more specific case by introducing --objects-edge-aggressive, a new
+   option to rev-list.
+
  * Squelched useless compiler warnings on Mac OS X regarding the
    crypto API.
 
@@ -113,6 +122,14 @@ Unless otherwise noted, all the fixes since v2.2 in the maintenance
 track are contained in this release (see the maintenance releases'
 notes for details).
 
+ * The logic in "git bisect bad HEAD" etc. to avoid forcing the test
+   of the common ancestor of bad and good commits was broken.
+   (merge 07913d5 cc/bisect-rev-parsing later to maint).
+
+ * "git checkout-index --temp=$target $path" did not work correctly
+   for paths outside the current subdirectory in the project.
+   (merge 74c4de5 es/checkout-index-temp later to maint).
+
  * The report from "git checkout" on a branch that builds on another
    local branch by setting its branch.*.merge to branch name (not a
    full refname) incorrectly said that the upstream is gone.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 53dd6b328563c143181a932c119754c62b4dc9b3..57dc9635aaf9f699bb56418701e05473d983de91 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.2.0.GIT
+DEF_VER=v2.3.0-rc0
 
 LF='
 '