Git 1.8.1.5

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

diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt
index 30d30a1cf926e8c1b9b2c9de9d5365cc8b19671c..efa68aef226c502f757a586406fa571ca346c01b 100644 (file)
--- a/Documentation/RelNotes/1.8.1.5.txt
+++ b/Documentation/RelNotes/1.8.1.5.txt
@@ -8,6 +8,12 @@ Fixes since v1.8.1.4
    the command line where an option is expected, the option parser
    used just one byte of the unknown letter when reporting an error.
 
    the command line where an option is expected, the option parser
    used just one byte of the unknown letter when reporting an error.
 

+ * In v1.8.1, the attribute parser was tightened too restrictive to
+   error out upon seeing an entry that begins with an ! (exclamation),
+   which may confuse users to expect a "negative match", which does
+   not exist.  This has been demoted to a warning; such an entry is
+   still ignored.
+

  * "git apply --summary" has been taught to make sure the similarity
    value shown in its output is sensible, even when the input had a
    bogus value.
  * "git apply --summary" has been taught to make sure the similarity
    value shown in its output is sensible, even when the input had a
    bogus value.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index cbac7711ea78e961c58954e47503b663e6030930..608fa3963dd0652329ce5a2c4b97acd66533d877 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ 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.4/git.html[documentation for release 1.8.1.4]
+* link:v1.8.1.5/git.html[documentation for release 1.8.1.5]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.8.1.5.txt[1.8.1.5],

   link:RelNotes/1.8.1.4.txt[1.8.1.4],
   link:RelNotes/1.8.1.3.txt[1.8.1.3],
   link:RelNotes/1.8.1.2.txt[1.8.1.2],
   link:RelNotes/1.8.1.4.txt[1.8.1.4],
   link:RelNotes/1.8.1.3.txt[1.8.1.3],
   link:RelNotes/1.8.1.2.txt[1.8.1.2],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index dcd3595f278439c267d8e7f9725efa2147bf1f15..6f09e2ff8bbd1b84e35a65ecf834a6ebea791532 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.4
+DEF_VER=v1.8.1.5

 
 LF='
 '
 
 LF='
 '