From: Junio C Hamano <junkio@cox.net>
Date: Tue, 24 Oct 2006 02:29:05 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1259404c7e5cd88b7f6692986469cd20cbfacdad;p=git.git

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.
---

1259404c7e5cd88b7f6692986469cd20cbfacdad
diff --cc Documentation/config.txt
index 05d657444,ee51fe3b9..026d4cf9a
--- a/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].