Git 1.8.1

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

diff --git a/Documentation/RelNotes/1.8.1.txt b/Documentation/RelNotes/1.8.1.txt
index fec1a06ec96e13c0e8ec24dac171dd5911130793..d6f9555923ae900bd9ff04e8283b513a678c1395 100644 (file)
--- a/Documentation/RelNotes/1.8.1.txt
+++ b/Documentation/RelNotes/1.8.1.txt
@@ -29,24 +29,17 @@ UI, Workflows & Features
 
  * Command-line completion scripts for tcsh and zsh have been added.
 
 
  * Command-line completion scripts for tcsh and zsh have been added.
 

- * A new remote-helper interface for Mercurial has been added to
-   contrib/remote-helpers.
+ * "git-prompt" scriptlet (in contrib/completion) can be told to paint
+   pieces of the hints in the prompt string in colors.
+
+ * Some documentation pages that used to ship only in the plain text
+   format are now formatted in HTML as well.

 
  * We used to have a workaround for a bug in ancient "less" that
    causes it to exit without any output when the terminal is resized.
    The bug has been fixed in "less" version 406 (June 2007), and the
    workaround has been removed in this release.
 
 
  * We used to have a workaround for a bug in ancient "less" that
    causes it to exit without any output when the terminal is resized.
    The bug has been fixed in "less" version 406 (June 2007), and the
    workaround has been removed in this release.
 

- * Some documentation pages that used to ship only in the plain text
-   format are now formatted in HTML as well.
-
- * "git-prompt" scriptlet (in contrib/completion) can be told to paint
-   pieces of the hints in the prompt string in colors.
-
- * A new configuration variable "diff.context" can be used to
-   give the default number of context lines in the patch output, to
-   override the hardcoded default of 3 lines.
-

  * When "git checkout" checks out a branch, it tells the user how far
    behind (or ahead) the new branch is relative to the remote tracking
    branch it builds upon.  The message now also advises how to sync
  * When "git checkout" checks out a branch, it tells the user how far
    behind (or ahead) the new branch is relative to the remote tracking
    branch it builds upon.  The message now also advises how to sync


@@ -60,13 +53,17 @@ UI, Workflows & Features
    API regression but it is expected that nobody will notice it in
    practice.
 
    API regression but it is expected that nobody will notice it in
    practice.
 

- * "git log -p -S<string>" now looks for the <string> after applying
-   the textconv filter (if defined); earlier it inspected the contents
-   of the blobs without filtering.
+ * A new configuration variable "diff.context" can be used to
+   give the default number of context lines in the patch output, to
+   override the hardcoded default of 3 lines.

 
  * "git format-patch" learned the "--notes=<ref>" option to give
    notes for the commit after the three-dash lines in its output.
 
 
  * "git format-patch" learned the "--notes=<ref>" option to give
    notes for the commit after the three-dash lines in its output.
 

+ * "git log -p -S<string>" now looks for the <string> after applying
+   the textconv filter (if defined); earlier it inspected the contents
+   of the blobs without filtering.
+

  * "git log --grep=<pcre>" learned to honor the "grep.patterntype"
    configuration set to "perl".
 
  * "git log --grep=<pcre>" learned to honor the "grep.patterntype"
    configuration set to "perl".
 


@@ -116,6 +113,9 @@ Foreign Interface
  * The remote helper interface to interact with subversion
    repositories (one of the GSoC 2012 projects) has been merged.
 
  * The remote helper interface to interact with subversion
    repositories (one of the GSoC 2012 projects) has been merged.
 

+ * A new remote-helper interface for Mercurial has been added to
+   contrib/remote-helpers.
+

  * The documentation for git(1) was pointing at a page at an external
    site for the list of authors that no longer existed.  The link has
    been updated to point at an alternative site.
  * The documentation for git(1) was pointing at a page at an external
    site for the list of authors that no longer existed.  The link has
    been updated to point at an alternative site.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index b0e8f02851c24453a07538d15385762b7843bf84..7a3f03b5ce28eca6b8803a842d44465a2104144e 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,6 +43,11 @@ unreleased) version of git, that is available from '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:v1.8.1/git.html[documentation for release 1.8.1]
+
+* release notes for
+  link:RelNotes/1.8.1.txt[1.8.1].
+

 * link:v1.8.0.3/git.html[documentation for release 1.8.0.3]
 
 * release notes for
 * link:v1.8.0.3/git.html[documentation for release 1.8.0.3]
 
 * release notes for

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b2dffc839f306123d544e8f536ee31a7574f1139..72e37c9bfe3e897635f8c211569d9e6f5658a980 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=v1.8.1-rc3
+DEF_VER=v1.8.1

 
 LF='
 '
 
 LF='
 '