diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2008-02-14 08:01:23 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 00:46:33 -0800 |
| commit | cb45f83cbdfcde4333ea5982b3c763e136fc599c (patch) | |
| tree | 6f3d00d8fd390ecccd1f840b968e32fd9ccb84f5 /Documentation/git-help.txt | |
| parent | 8e08689959a78bb4f27e010fbd225b4bf3addadb (diff) | |
| download | git-cb45f83cbdfcde4333ea5982b3c763e136fc599c.tar.gz | |
Documentation: add 'git-web--browse.txt' and simplify other docs.
'git-help.txt' and 'git-instaweb.txt' contained duplicated
information about 'git-web--browse'.
This patch puts this information where it belongs.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-help.txt')
| -rw-r--r-- | Documentation/git-help.txt | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index ad41aabeb0..0926dc12ba 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -48,26 +48,8 @@ OPTIONS The web browser can be specified using the configuration variable 'help.browser', or 'web.browser' if the former is not set. If none of these config variables is set, the 'git-web--browse' helper script -(called by 'git-help') will pick a suitable default. -+ -You can explicitly provide a full path to your preferred browser by -setting the configuration variable 'browser.<tool>.path'. For example, -you can configure the absolute path to firefox by setting -'browser.firefox.path'. Otherwise, 'git-web--browse' assumes the tool -is available in PATH. -+ -Note that the script tries, as much as possible, to display the HTML -page in a new tab on an already opened browser. -+ -The following browsers are currently supported by 'git-web--browse': -+ -* firefox (this is the default under X Window when not using KDE) -* iceweasel -* konqueror (this is the default under KDE) -* w3m (this is the default outside X Window) -* links -* lynx -* dillo +(called by 'git-help') will pick a suitable default. See +linkgit:git-web--browse[1] for more information about this. CONFIGURATION VARIABLES ----------------------- @@ -84,7 +66,7 @@ line option: The 'help.browser', 'web.browser' and 'browser.<tool>.path' will also be checked if the 'web' format is chosen (either by command line option or configuration variable). See '-w|--web' in the OPTIONS -section above. +section above and linkgit:git-web--browse[1]. Note that these configuration variables should probably be set using the '--global' flag, for example like this: |