Git 1.8.2.1

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

diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt
index 1ded500fc34a9d4da164e74c2ff433dc764d7e57..1354ad03f5e65cf85ec4c1e2b68c6152c3f295b8 100644 (file)
--- a/Documentation/RelNotes/1.8.2.1.txt
+++ b/Documentation/RelNotes/1.8.2.1.txt
@@ -4,6 +4,11 @@ Git v1.8.2.1 Release Notes
 Fixes since v1.8.2
 ------------------
 
+ * An earlier change to the attribute system introduced at v1.8.1.2 by
+   mistake stopped a pattern "dir" (without trailing slash) from
+   matching a directory "dir" (it only wanted to allow pattern "dir/"
+   to also match).
+
  * Verification of signed tags were not done correctly when not in C
    or en/US locale.
 

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5a6178820d76425708118bdde37afba5e5f9d3f4..6a875f2adefe34e27bc0fc3b6fdb9d7bcfd23301 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:
 
-* link:v1.8.2/git.html[documentation for release 1.8.2]
+* link:v1.8.2.1/git.html[documentation for release 1.8.2.1]
 
 * release notes for
+  link:RelNotes/1.8.2.1.txt[1.8.2.1].
   link:RelNotes/1.8.2.txt[1.8.2].
 
 * link:v1.8.1.6/git.html[documentation for release 1.8.1.6]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f189b7889e7b19fd1e8a5412c899d8b70fab9d9d..26422bfc22e979cf0497adad076e6b17fa50e2ca 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.2
+DEF_VER=v1.8.2.1
 
 LF='
 '