diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:13:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:13:31 -0800 |
| commit | a77133e383d98db5a5bed03e808e922b0e9d0655 (patch) | |
| tree | b06ca1b54d971308931f683eacd4012bc8afcc2e | |
| parent | 6d7c1c88940320c2ccde9d996181826a38ff7a81 (diff) | |
| parent | b1f809d0aecd9b0853d728dbc3d4c4e44e235785 (diff) | |
| download | git-a77133e383d98db5a5bed03e808e922b0e9d0655.tar.xz | |
Merge branch 'ss/help-htmlpath-config-doc' into maint
* ss/help-htmlpath-config-doc:
config.txt: Document help.htmlpath config parameter
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bf8f911e1f..e452ff89ba 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1351,6 +1351,12 @@ help.autocorrect:: value is 0 - the command will be just shown but not executed. This is the default. +help.htmlpath:: + Specify the path where the HTML documentation resides. File system paths + and URLs are supported. HTML pages will be prefixed with this path when + help is displayed in the 'web' format. This defaults to the documentation + path of your Git installation. + http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see |