Sync with 1.7.8.6

diff --cc Documentation/git.txt
index ae34e8a7f6b34d81550f0adf60098b075e8b7757,16528492dfc8d1e7a24746d63632680aa1763add..f28a1767386ad933f996af6e7eaf63da48770777
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,20 -44,10 +44,21 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.7.8.5/git.html[documentation for release 1.7.8.5]
 +* link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
 +
 +* release notes for
 +  link:RelNotes/1.7.9.6.txt[1.7.9.6],
 +  link:RelNotes/1.7.9.5.txt[1.7.9.5],
 +  link:RelNotes/1.7.9.4.txt[1.7.9.4],
 +  link:RelNotes/1.7.9.3.txt[1.7.9.3],
 +  link:RelNotes/1.7.9.2.txt[1.7.9.2],
 +  link:RelNotes/1.7.9.1.txt[1.7.9.1],
 +  link:RelNotes/1.7.9.txt[1.7.9].
 +
+ * link:v1.7.8.6/git.html[documentation for release 1.7.8.6]
  
  * release notes for
+   link:RelNotes/1.7.8.6.txt[1.7.8.6],
    link:RelNotes/1.7.8.5.txt[1.7.8.5],
    link:RelNotes/1.7.8.4.txt[1.7.8.4],
    link:RelNotes/1.7.8.3.txt[1.7.8.3],

diff --cc bundle.c
Simple merge