Git 2.8-rc2

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

diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt
index b7a6d6826d1a99f0027f8ebec67028ca98145577..14b6c70ed6a64cae8d75fd0de863f66597c67da8 100644 (file)
--- a/Documentation/RelNotes/2.8.0.txt
+++ b/Documentation/RelNotes/2.8.0.txt
@@ -281,6 +281,11 @@ notes for details).
    listing and sparse checkout selection areas in 2.7.0; the change
    that is responsible for the regression has been reverted.
 
+ * Another try to improve the ignore mechanism that lets you say "this
+   is excluded" and then later say "oh, no, this part (that is a
+   subset of the previous part) is not excluded".  This has still a
+   known limitation, though.
+
  * Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
    (e.g. COMMIT_EDITMSG) that is meant to be left after the command is
    done.  This however did not work well if the repository is set to
@@ -372,10 +377,6 @@ notes for details).
    misbehaved when run from a subdirectory.
    (merge 17f1365 nd/git-common-dir-fix later to maint).
 
- * Another try to add support to the ignore mechanism that lets you
-   say "this is excluded" and then later say "oh, no, this part (that
-   is a subset of the previous part) is not excluded".
-
  * "git worktree add -B <branchname>" did not work.
 
  * The "v(iew)" subcommand of the interactive "git am -i" command was

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 61c424056a744dd5e0aaf2049e0eacd982bfc345..b373d8ae8ddfd828951c5d93cb9032de0071dfde 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.0-rc1
+DEF_VER=v2.8.0-rc2
 
 LF='
 '