Sync with 1.7.11.7

diff --cc .gitignore
Simple merge

diff --cc Documentation/git.txt
index fab6e77e02c9773a0230ac7dadf53670a60ac8a5,65c37c4544f2bed6c979000e726ee5500f588ceb..34d8a1bbdfe974f1ba83028f3875bca5b439f418
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -44,10 +43,15 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.7.11.6/git.html[documentation for release 1.7.11.6]
 +* link:v1.7.12/git.html[documentation for release 1.7.12]
 +
 +* release notes for
 +  link:RelNotes/1.7.12.txt[1.7.12].
 +
+ * link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
  
  * release notes for
+   link:RelNotes/1.7.11.7.txt[1.7.11.7],
    link:RelNotes/1.7.11.6.txt[1.7.11.6],
    link:RelNotes/1.7.11.5.txt[1.7.11.5],
    link:RelNotes/1.7.11.4.txt[1.7.11.4],

diff --cc Makefile
Simple merge

diff --cc builtin/log.c
Simple merge