Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-02 01:17:18 +0400
committerJunio C Hamano <gitster@pobox.com>2013-03-02 01:17:18 +0400
commit06d67b876642822828596b0b38cda2f61d438335 (patch)
tree67de0d436a69443bf288411323b0ed209a6cb000 /Documentation
parent443d803e0dacd0a1c6700503689f3cd95751aba1 (diff)
parente6363a4992637267ef212d7c709ede17d4122e0d (diff)
Sync with 1.8.1.5
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.8.1.5.txt6
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/githooks.txt2
3 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt
index 30d30a1cf9..efa68aef22 100644
--- 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.
+ * 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.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 79aa8cd149..9d29ed5504 100644
--- 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.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
+ 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],
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 8181e4ed2a..eab9b356cd 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -365,7 +365,7 @@ preceding SP is also omitted. Currently, no commands pass any
'extra-info'.
The hook always runs after the automatic note copying (see
-"notes.rewrite.<command>" in linkgit:git-config.txt) has happened, and
+"notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and
thus has access to these notes.
The following command-specific comments apply: