Merge branch 'maint-2.7' into maint-2.8

diff --cc Documentation/git.txt
index 5a10e9b4a06cbf34ff3d15032fe7f7d13ed0c3ba,bf9b6c8c87799b4fc46c7bfc3b899c023b9d8f1c..2cfad870fc59a6b4960291ae78104cd432a4f823
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,18 -43,11 +43,20 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.7.3/git.html[documentation for release 2.7.3]
 +* link:v2.8.4/git.html[documentation for release 2.8.4]
 +
 +* release notes for
 +  link:RelNotes/2.8.4.txt[2.8.4],
 +  link:RelNotes/2.8.3.txt[2.8.3],
 +  link:RelNotes/2.8.2.txt[2.8.2],
 +  link:RelNotes/2.8.1.txt[2.8.1],
 +  link:RelNotes/2.8.0.txt[2.8].
 +
+ * link:v2.7.5/git.html[documentation for release 2.7.5]
  
  * release notes for
+   link:RelNotes/2.7.5.txt[2.7.5],
+   link:RelNotes/2.7.4.txt[2.7.4],
    link:RelNotes/2.7.3.txt[2.7.3],
    link:RelNotes/2.7.2.txt[2.7.2],
    link:RelNotes/2.7.1.txt[2.7.1],

diff --cc shell.c
Simple merge