From: Christian Couder Date: Fri, 25 Apr 2008 06:25:35 +0000 (+0200) Subject: documentation: help: add info about "man..cmd" config var X-Git-Tag: v1.5.6-rc0~82^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0bb64009586b7fd674b1c3238f041b61c5d03f91;p=git.git documentation: help: add info about "man..cmd" config var This patch also describes the current behavior for "konqueror" and how to modify it using "man..cmd" if needed. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index 138ba9ad8..3b65c0751 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -805,6 +805,11 @@ merge..recursive:: performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details. +man..cmd:: + Specify the command to invoke the specified man viewer. The + specified command is evaluated in shell with the man page + passed as argument. (See linkgit:git-help[1].) + man..path:: Override the path for the given tool that may be used to display help in the 'man' format. See linkgit:git-help[1]. diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 4c6cb2194..bfbba9e23 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -82,22 +82,28 @@ man.viewer ~~~~~~~~~~ The 'man.viewer' config variable will be checked if the 'man' format -is chosen. Only the following values are currently supported: +is chosen. The following values are currently supported: * "man": use the 'man' program as usual, * "woman": use 'emacsclient' to launch the "woman" mode in emacs (this only works starting with emacsclient versions 22), -* "konqueror": use a man KIO slave in konqueror. +* "konqueror": use 'kfmclient' to open the man page in a new konqueror +tab (see 'Note about konqueror' below). -Multiple values may be given to this configuration variable. Their -corresponding programs will be tried in the order listed in the -configuration file. +Values for other tools can be used if there is a corresponding +'man..cmd' configuration entry (see below). + +Multiple values may be given to the 'man.viewer' configuration +variable. Their corresponding programs will be tried in the order +listed in the configuration file. For example, this configuration: +------------------------------------------------ [man] viewer = konqueror viewer = woman +------------------------------------------------ will try to use konqueror first. But this may fail (for example if DISPLAY is not set) and in that case emacs' woman mode will be tried. @@ -113,6 +119,38 @@ can configure the absolute path to konqueror by setting 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in PATH. +man..cmd +~~~~~~~~~~~~~~ + +When the man viewer, specified by the 'man.viewer' configuration +variables, is not among the supported ones, then the corresponding +'man..cmd' configuration variable will be looked up. If this +variable exists then the specified tool will be treated as a custom +command and a shell eval will be used to run the command with the man +page passed as arguments. + +Note about konqueror +~~~~~~~~~~~~~~~~~~~~ + +When 'konqueror' is specified in the 'man.viewer' configuration +variable, we launch 'kfmclient' to try to open the man page on an +already opened konqueror in a new tab if possible. + +For consistency, we also try such a trick if 'man.konqueror.path' is +set to something like 'A_PATH_TO/konqueror'. That means we will try to +launch 'A_PATH_TO/kfmclient' instead. + +If you really want to use 'konqueror', then you can use something like +the following: + +------------------------------------------------ + [man] + viewer = konq + + [man "konq"] + cmd = A_PATH_TO/konqueror +------------------------------------------------ + Note about git config --global ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~