diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:06:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:06:11 -0700 |
| commit | d576c45aae8479e6a50ae183e3a6ef4d6b42489f (patch) | |
| tree | 76ebe7cd7bfabb32c05864faa475d0cd9ac60495 /Documentation/config.txt | |
| parent | ca1a5eeead00b1caa2274fe011bb3d7de0bdffb2 (diff) | |
| parent | ac3a4a2694fa8bea477b1a265efd6829de686e5c (diff) | |
| download | git-d576c45aae8479e6a50ae183e3a6ef4d6b42489f.tar.gz git-d576c45aae8479e6a50ae183e3a6ef4d6b42489f.tar.xz | |
Merge branch 'cc/help'
* cc/help:
documentation: web--browse: add a note about konqueror
documentation: help: add info about "man.<tool>.cmd" config var
help: use "man.<tool>.cmd" as custom man viewer command
documentation: help: add "man.<tool>.path" config variable
help: use man viewer path from "man.<tool>.path" config var
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c4d6ccdf2..7a91ac16f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -841,6 +841,15 @@ merge.<driver>.recursive:: performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details. +man.<tool>.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.<tool>.path:: + Override the path for the given tool that may be used to + display help in the 'man' format. See linkgit:git-help[1]. + mergetool.<tool>.path:: Override the path for the given tool. This is useful in case your tool is not in the PATH. |