Sync with 1.8.4.5

diff --cc Documentation/git.txt
index b73a24a3c78c72c8cb6e75b0e14a45cb0e0b42e9,8f7a4607be4af98c8a306839e522a308cde9a33e..4545afbd9ea285075ebef82a1955f5d38a6a8c57
--- 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:v1.8.4.4/git.html[documentation for release 1.8.4.4]
 +* link:v1.8.5/git.html[documentation for release 1.8.5]
 +
 +* release notes for
 +  link:RelNotes/1.8.5.txt[1.8.5].
 +
+ * link:v1.8.4.5/git.html[documentation for release 1.8.4.5]
  
  * release notes for
+   link:RelNotes/1.8.4.5.txt[1.8.4.5],
    link:RelNotes/1.8.4.4.txt[1.8.4.4],
    link:RelNotes/1.8.4.3.txt[1.8.4.3],
    link:RelNotes/1.8.4.2.txt[1.8.4.2],

diff --cc git-submodule.sh
Simple merge