Sync with 2.4.8

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

diff --cc Documentation/git.txt
index f4cb5cb,e74e654..5e0397a
--- 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:RelNotes/2.5.0.txt[2.5],
 +* link:v2.5.0/git.html[documentation for release 2.5]
 +
 +* release notes for
- * link:v2.4.7/git.html[documentation for release 2.4.7]
++  link:RelNotes/2.5.0.txt[2.5].
 +
+ * link:v2.4.8/git.html[documentation for release 2.4.8]
  
  * release notes for
+   link:RelNotes/2.4.8.txt[2.4.8],
    link:RelNotes/2.4.7.txt[2.4.7],
    link:RelNotes/2.4.6.txt[2.4.6],
    link:RelNotes/2.4.5.txt[2.4.5],

diff --cc GIT-VERSION-GEN
Simple merge