Sync with 1.7.11.5

Author: gitster

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.

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],