From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Mar 2008 08:10:32 +0000 (-0700)
Subject: Merge branch 'cc/help'
X-Git-Tag: v1.5.5-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/50c2b54b23e0d7df40bd8739c1c96df42c47f280?ds=inline;hp=-c

Merge branch 'cc/help'

* cc/help:
Documentation/git-help: typofix
help: warn if specified 'man.viewer' is unsupported, instead of erroring out
Documentation: help: explain 'man.viewer' multiple values
help: implement multi-valued "man.viewer" config option
Documentation: help: describe 'man.viewer' config variable
help: add "man.viewer" config var to use "woman" or "konqueror"
---

50c2b54b23e0d7df40bd8739c1c96df42c47f280
diff --combined Documentation/config.txt
index ed2cb832b9,ae1486da3d..0865f4e01a
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -420,11 -420,6 +420,11 @@@ branch.<name>.rebase:
  	it unless you understand the implications (see linkgit:git-rebase[1]
  	for details).
  
 +browser.<tool>.cmd::
 +	Specify the command to invoke the specified browser. The
 +	specified command is evaluated in shell with the URLs passed
 +	as arguments. (See linkgit:git-web--browse[1].)
 +
  browser.<tool>.path::
  	Override the path for the given tool that may be used to
  	browse HTML help (see '-w' option in linkgit:git-help[1]) or a
@@@ -595,10 -590,6 +595,10 @@@ gc.packrefs:
  	at some stage, and setting this to `false` will continue to
  	prevent `git pack-refs` from being run from `git gc`.
  
 +gc.pruneexpire::
 +	When `git gc` is run, it will call `prune --expire 2.weeks.ago`.
 +	Override the grace period with this config variable.
 +
  gc.reflogexpire::
  	`git reflog expire` removes reflog entries older than
  	this time; defaults to 90 days.
@@@ -757,6 -748,10 +757,10 @@@ log.showroot:
  	Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
  	normally hide the root commit will now show it. True by default.
  
+ man.viewer::
+ 	Specify the programs that may be used to display help in the
+ 	'man' format. See linkgit:git-help[1].
+ 
  merge.summary::
  	Whether to include summaries of merged commits in newly created
  	merge commit messages. False by default.
@@@ -869,7 -864,7 +873,7 @@@ pack.indexVersion:
  	whenever the corresponding pack is larger than 2 GB.  Otherwise
  	the default is 1.
  
 -pack.packSizeLimit:
 +pack.packSizeLimit::
  	The default maximum size of a pack.  This setting only affects
  	packing to a file, i.e. the git:// protocol is unaffected.  It
  	can be overridden by the `\--max-pack-size` option of