Sync with 2.3.8

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

diff --cc Documentation/blame-options.txt
Simple merge

diff --cc Documentation/git-log.txt
Simple merge

diff --cc Documentation/git.txt
index c71e818,adff610..55470aa
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -43,10 +43,15 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.3.7/git.html[documentation for release 2.3.7]
 +* link:v2.4.0/git.html[documentation for release 2.4]
 +
 +* release notes for
 +  link:RelNotes/2.4.0.txt[2.4].
 +
+ * link:v2.3.8/git.html[documentation for release 2.3.8]
  
  * release notes for
+   link:RelNotes/2.3.8.txt[2.3.8],
    link:RelNotes/2.3.7.txt[2.3.7],
    link:RelNotes/2.3.6.txt[2.3.6],
    link:RelNotes/2.3.5.txt[2.3.5],

diff --cc builtin/config.c
Simple merge

diff --cc line-log.c
Simple merge

diff --cc t/t4053-diff-no-index.sh
Simple merge