Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  git-clone: add missing comma in --reference documentation
  git-cvsserver: no longer use deprecated 'git-subcommand' commands
  clone: disconnect transport after fetching

diff --cc Documentation/git-clone.txt
index 2c63a0fbaee0e246538607c8e2f983eb6eafa8e5,87c13ab13eb05e67312bf45de3e31ca30f7a01ab..1709a2dbd083bf8622ea42790cecca0ec21747c1
--- 1/Documentation/git-clone.txt
--- 2/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -72,19 -72,11 +72,19 @@@ These objects may be removed by normal 
  which automatically call `git gc --auto`. (See linkgit:git-gc[1].)
  If these objects are removed and were referenced by the cloned repository,
  then the cloned repository will become corrupt.
 -
 -
 ++
 +Note that running `git repack` without the `-l` option in a repository
 +cloned with `-s` will copy objects from the source repository into a pack
 +in the cloned repository, removing the disk space savings of `clone -s`.
 +It is safe, however, to run `git gc`, which uses the `-l` option by
 +default.
 ++
 +If you want to break the dependency of a repository cloned with `-s` on
 +its source repository, you can simply run `git repack -a` to copy all
 +objects from the source repository into a pack in the cloned repository.
  
  --reference <repository>::
-       If the reference repository is on the local machine
+       If the reference repository is on the local machine,
        automatically setup .git/objects/info/alternates to
        obtain objects from the reference repository.  Using
        an already existing repository as an alternate will

diff --cc builtin-clone.c
Simple merge