Git 2.5.0-rc0

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

diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.txt
index 5030b24d850d6075fe4180d60769873eefdbf478..5e0396119394f21a4fd839c262b23c7c128b6905 100644 (file)
--- a/Documentation/RelNotes/2.5.0.txt
+++ b/Documentation/RelNotes/2.5.0.txt
@@ -149,7 +149,7 @@ UI, Workflows & Features
  * Many long-running operations show progress eye-candy, even when
    they are later backgrounded.  Hide the eye-candy when the process
    is sent to the background instead.
  * Many long-running operations show progress eye-candy, even when
    they are later backgrounded.  Hide the eye-candy when the process
    is sent to the background instead.

-   (merge 9a9a41d lm/squelch-bg-progress later to maint).
+   (merge a4fb76c lm/squelch-bg-progress later to maint).

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


@@ -231,7 +231,7 @@ notes for details).
 
  * Memory usage of "git index-pack" has been trimmed by tens of
    per-cent.
 
  * Memory usage of "git index-pack" has been trimmed by tens of
    per-cent.

-   (merge a78c5b3 nd/slim-index-pack-memory-usage later to maint).
+   (merge f0e7f11 nd/slim-index-pack-memory-usage later to maint).

 
  * "git rev-list --objects $old --not --all" to see if everything that
    is reachable from $old is already connected to the existing refs
 
  * "git rev-list --objects $old --not --all" to see if everything that
    is reachable from $old is already connected to the existing refs


@@ -339,19 +339,6 @@ notes for details).
    the order was swapped from the beginning. This belatedly fixes it.
    (merge 099d2d8 jc/gitignore-precedence later to maint).
 
    the order was swapped from the beginning. This belatedly fixes it.
    (merge 099d2d8 jc/gitignore-precedence later to maint).
 

- * After "git add -N", the path appeared in output of "git diff HEAD"
-   and "git diff --cached HEAD", leading "git status" to classify it
-   as "Changes to be committed".  Such a path, however, is not yet to
-   be scheduled to be committed.  "git diff" showed the change to the
-   path as modification, not as a "new file", in the header of its
-   output.
-
-   Treat such paths as "yet to be added to the index but Git already
-   know about them"; "git diff HEAD" and "git diff --cached HEAD"
-   should not talk about them, and "git diff" should show them as new
-   files yet to be added to the index.
-   (merge d95d728 nd/diff-i-t-a later to maint).
-

  * There was a commented-out (instead of being marked to expect
    failure) test that documented a breakage that was fixed since the
    test was written; turn it into a proper test.
  * There was a commented-out (instead of being marked to expect
    failure) test that documented a breakage that was fixed since the
    test was written; turn it into a proper test.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index bfb715d3c896bea3f6eba7da43fabe4370530efa..f27adc2b23d0b120e3d4baf4f5d8ce7c0925f563 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.4.0.GIT
+DEF_VER=v2.5.0-rc0

 
 LF='
 '
 
 LF='
 '