Git 2.6-rc2

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

diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt
index 870df859748de1526982661846978a52808cefc9..7d65c163da061901d1596bc0703f13e780a13f6e 100644 (file)
--- a/Documentation/RelNotes/2.6.0.txt
+++ b/Documentation/RelNotes/2.6.0.txt
@@ -84,6 +84,12 @@ UI, Workflows & Features
  * "git config --list" output was hard to parse when values consist of
    multiple lines.  "--name-only" option is added to help this.
 
+ * A handful of usability & cosmetic fixes to gitk and l10n updates.
+
+ * A completely empty e-mail address <> is now allowed in the authors
+   file used by git-svn, to match the way it accepts the output from
+   authors-prog.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -349,3 +355,5 @@ notes for details).
    (merge b8c1d27 ah/pack-objects-usage-strings later to maint).
    (merge 486e1e1 br/svn-doc-include-paths-config later to maint).
    (merge 1733ed3 ee/clean-test-fixes later to maint).
+   (merge 5fcadc3 gb/apply-comment-typofix later to maint).
+   (merge b894d3e mp/t7060-diff-index-test later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 181f397bd4537988fe68e997fb95279e86838ebc..037c57e94d24d9ef713101dcecd1a1ec03fc0a29 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.6.0-rc1
+DEF_VER=v2.6.0-rc2
 
 LF='
 '