diff options
| -rw-r--r-- | Documentation/git-help.txt | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | git-web--browse.sh (renamed from git-help--browse.sh) | 0 | ||||
| -rw-r--r-- | help.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index fb77ca3a57..ad41aabeb0 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -47,19 +47,19 @@ 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-help--browse' helper script +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-help--browse' assumes the tool +'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-help--browse': +The following browsers are currently supported by 'git-web--browse': + * firefox (this is the default under X Window when not using KDE) * iceweasel @@ -231,7 +231,7 @@ SCRIPT_SH = \ git-lost-found.sh git-quiltimport.sh git-submodule.sh \ git-filter-branch.sh \ git-stash.sh \ - git-help--browse.sh + git-web--browse.sh SCRIPT_PERL = \ git-add--interactive.perl \ diff --git a/git-help--browse.sh b/git-web--browse.sh index 8ed489d882..8ed489d882 100755 --- a/git-help--browse.sh +++ b/git-web--browse.sh @@ -347,7 +347,7 @@ static void show_html_page(const char *git_cmd) get_html_page_path(&page_path, page); - execl_git_cmd("help--browse", "-c", "help.browser", page_path.buf, NULL); + execl_git_cmd("web--browse", "-c", "help.browser", page_path.buf, NULL); } void help_unknown_cmd(const char *cmd) |