Git 2.8

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 5ec39bc300998a1d3add97026a46030cbc4b1926..25079710fa28155cf8d2747d9cbca14fcd84f360 100644 (file)
--- a/Documentation/RelNotes/2.8.0.txt
+++ b/Documentation/RelNotes/2.8.0.txt
@@ -34,7 +34,7 @@ UI, Workflows & Features
    have a place to store the updated notes tree, iow, a ref).
 
  * "git grep" by default does not fall back to its "--no-index"
    have a place to store the updated notes tree, iow, a ref).
 
  * "git grep" by default does not fall back to its "--no-index"

-   behaviour outside a directory under Git's control (otherwise the
+   behavior outside a directory under Git's control (otherwise the

    user may by mistake end up running a huge recursive search); with a
    new configuration (set in $HOME/.gitconfig--by definition this
    cannot be set in the config file per project), this safety can be
    user may by mistake end up running a huge recursive search); with a
    new configuration (set in $HOME/.gitconfig--by definition this
    cannot be set in the config file per project), this safety can be


@@ -55,7 +55,7 @@ UI, Workflows & Features
 
  * Many commands that read files that are expected to contain text
    that is generated (or can be edited) by the end user to control
 
  * Many commands that read files that are expected to contain text
    that is generated (or can be edited) by the end user to control

-   their behaviour (e.g. "git grep -f <filename>") have been updated
+   their behavior (e.g. "git grep -f <filename>") have been updated

    to be more tolerant to lines that are terminated with CRLF (they
    used to treat such a line to contain payload that ends with CR,
    which is usually not what the users expect).
    to be more tolerant to lines that are terminated with CRLF (they
    used to treat such a line to contain payload that ends with CR,
    which is usually not what the users expect).


@@ -187,7 +187,7 @@ Performance, Internal Implementation, Development Support etc.
    with expectations that are not satisfiable on Git for Windows.
 
  * Some calls to strcpy(3) triggers a false warning from static
    with expectations that are not satisfiable on Git for Windows.
 
  * Some calls to strcpy(3) triggers a false warning from static

-   analysers that are less intelligent than humans, and reducing the
+   analyzers that are less intelligent than humans, and reducing the

    number of these false hits helps us notice real issues.  A few
    calls to strcpy(3) in a couple of protrams that are already safe
    has been rewritten to avoid false warnings.
    number of these false hits helps us notice real issues.  A few
    calls to strcpy(3) in a couple of protrams that are already safe
    has been rewritten to avoid false warnings.


@@ -281,7 +281,7 @@ notes for details).
  * "git send-email" was confused by escaped quotes stored in the alias
    files saved by "mutt", which has been corrected.
 
  * "git send-email" was confused by escaped quotes stored in the alias
    files saved by "mutt", which has been corrected.
 

- * A few unportable C construct have been spotted by clang compiler
+ * A few non-portable C construct have been spotted by clang compiler

    and have been fixed.
 
  * The documentation has been updated to hint the connection between
    and have been fixed.
 
  * The documentation has been updated to hint the connection between


@@ -349,10 +349,10 @@ notes for details).
  * "git worktree" had a broken code that attempted to auto-fix
    possible inconsistency that results from end-users moving a
    worktree to different places without telling Git (the original
  * "git worktree" had a broken code that attempted to auto-fix
    possible inconsistency that results from end-users moving a
    worktree to different places without telling Git (the original

-   repository needs to maintain backpointers to its worktrees, but
-   "mv" run by end-users who are not familiar with that fact will
-   obviously not adjust them), which actually made things worse
-   when triggered.
+   repository needs to maintain back-pointers to its worktrees,
+   but "mv" run by end-users who are not familiar with that fact
+   will obviously not adjust them), which actually made things
+   worse when triggered.

 
  * The low-level merge machinery has been taught to use CRLF line
    termination when inserting conflict markers to merged contents that
 
  * The low-level merge machinery has been taught to use CRLF line
    termination when inserting conflict markers to merged contents that

diff --git a/Documentation/git.txt b/Documentation/git.txt
index a9120a8779ce8c4a9e2fda781add92eaec60d055..adc940bf7591069c74c9b47aa5e5686e0438d606 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

+* link:v2.8.0/git.html[documentation for release 2.8]
+
+* release notes for
+  link:RelNotes/2.8.0.txt[2.8].
+

 * link:v2.7.3/git.html[documentation for release 2.7.3]
 
 * release notes for
 * link:v2.7.3/git.html[documentation for release 2.7.3]
 
 * release notes for

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b5072a28ed488a2d0a1da85d04d7ae93e1a39105..4e9450b3ae0c403820f0166435c52c4ea74e7451 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.8.0-rc4
+DEF_VER=v2.8.0

 
 LF='
 '
 
 LF='
 '