Sync with 2.4.8

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

diff --combined Documentation/git.txt
index f4cb5cb200cf69461d5af39d4c29b51138e4d3ec,e74e6540996749337de897c5f6171e65d5fae6eb..5e0397a448c5a3656612fd2599d589ce3df27b50
--- 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],
@@@ -846,15 -842,6 +847,15 @@@ Git so take care if using Cogito etc
        an explicit repository directory set via 'GIT_DIR' or on the
        command line.
  
 +'GIT_COMMON_DIR'::
 +      If this variable is set to a path, non-worktree files that are
 +      normally in $GIT_DIR will be taken from this path
 +      instead. Worktree-specific files such as HEAD or index are
 +      taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and
 +      linkgit:git-worktree[1] for
 +      details. This variable has lower precedence than other path
 +      variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
 +
  Git Commits
  ~~~~~~~~~~~
  'GIT_AUTHOR_NAME'::

diff --combined GIT-VERSION-GEN
index cd968201627162f36e56e078d5631a19ef505b08,a6a0bf9aa70cc0e1e14c71e7ba1f0b8b3ed829a9..5cadf44e1a5372c480eeec43683210964ad8c1ca
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v2.4.8
 +DEF_VER=v2.5.0
  
  LF='
  '
@@@ -38,5 -38,3 +38,3 @@@ test "$VN" = "$VC" || 
        echo >&2 "GIT_VERSION = $VN"
        echo "GIT_VERSION = $VN" >$GVF
  }
- 
-