summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-15 20:41:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-15 20:41:17 (GMT)
commit47e32d071ea7623be4e2b53ce412612139e4127f (patch)
treeb46b0aa9c7817e6c3db91266aaeca953154d42e5
parent61b472ed8b090a3e9240590c85041120a54dd268 (diff)
parentcd7c0be19f49efe77a8b0690ab92d2eb1cff1778 (diff)
downloadgit-47e32d071ea7623be4e2b53ce412612139e4127f.zip
git-47e32d071ea7623be4e2b53ce412612139e4127f.tar.gz
git-47e32d071ea7623be4e2b53ce412612139e4127f.tar.bz2
Sync with 1.7.11.5
-rw-r--r--Documentation/RelNotes/1.7.11.5.txt8
-rw-r--r--Documentation/git.txt3
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.11.5.txt b/Documentation/RelNotes/1.7.11.5.txt
index 86df992..0a2ed85 100644
--- a/Documentation/RelNotes/1.7.11.5.txt
+++ b/Documentation/RelNotes/1.7.11.5.txt
@@ -7,6 +7,10 @@ Fixes since v1.7.11.4
* The Makefile rule to create assembly output (primarily for
debugging purposes) did not create it next to the source.
+ * The code to avoid mistaken attempt to add the object directory
+ itself as its own alternate could read beyond end of a string while
+ comparison.
+
* On some architectures, "block-sha1" did not compile correctly
when compilers inferred alignment guarantees from our source we
did not intend to make.
@@ -25,4 +29,8 @@ Fixes since v1.7.11.4
* "git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.
+ * "git grep" stopped spawning an external "grep" long time ago, but a
+ duplicated test to check internal and external "grep" was left
+ behind.
+
Also contains minor typofixes and documentation updates.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7af8aaa..677eb95 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,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.7.11.4/git.html[documentation for release 1.7.11.4]
+* link:v1.7.11.5/git.html[documentation for release 1.7.11.5]
* release notes for
+ link:RelNotes/1.7.11.5.txt[1.7.11.5],
link:RelNotes/1.7.11.4.txt[1.7.11.4],
link:RelNotes/1.7.11.3.txt[1.7.11.3],
link:RelNotes/1.7.11.2.txt[1.7.11.2],