diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-14 13:17:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-14 13:17:56 -0700 |
| commit | 45733fa93f287fbc04d6a6a3f5a39cc852c5cf50 (patch) | |
| tree | 5e23375b3475a88c0296f2581ca97de5602d3667 | |
| parent | Merge git://ozlabs.org/~paulus/gitk (diff) | |
| download | tgif-45733fa93f287fbc04d6a6a3f5a39cc852c5cf50.tar.xz | |
Git 2.6-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.6.0.txt | 8 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.6.0.txt b/Documentation/RelNotes/2.6.0.txt index 870df85974..7d65c163da 100644 --- 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 181f397bd4..037c57e94d 100755 --- 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=' ' |