Merge branch 'maint'

* maint:
  gitweb: Fix setting $/ in parse_commit()
  daemon: do not die on older clients.
  xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
  git-clone: honor --quiet
  Documentation for the [remote] config
  prune-packed: Fix uninitialized variable.

diff --cc Documentation/config.txt
index 05d657444fc31768f9bf9909324b708ac6fcfd46,ee51fe3b9fcb551d8dbd6374103898229d4b77ea..026d4cf9ade90cd108d351e372ed862378cde100
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -230,10 -230,18 +230,22 @@@ pull.octopus:
  pull.twohead::
        The default merge strategy to use when pulling a single branch.
  
+ remote.<name>.url::
+       The URL of a remote repository.  See gitlink:git-fetch[1] or
+       gitlink:git-push[1].
+ 
+ remote.<name>.fetch::
+       The default set of "refspec" for gitlink:git-fetch[1]. See
+       gitlink:git-fetch[1].
+ 
+ remote.<name>.push::
+       The default set of "refspec" for gitlink:git-push[1]. See
+       gitlink:git-push[1].
+ 
 +repack.usedeltabaseoffset::
 +      Allow gitlink:git-repack[1] to create packs that uses
 +      delta-base offset.  Defaults to false.
 +
  show.difftree::
        The default gitlink:git-diff-tree[1] arguments to be used
        for gitlink:git-show[1].

diff --cc git-clone.sh
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge