From 1200471bdfa0c611af90bc58ba6386f7e6d6072b Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Mar 2016 11:16:23 -0800
Subject: [PATCH] Git 2.8-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/RelNotes/2.8.0.txt | 9 +++++----
GIT-VERSION-GEN | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt
index b7a6d6826d..14b6c70ed6 100644
--- 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 61c424056a..b373d8ae8d 100755
--- 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='
'
--
GitLab