summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2008-02-02 06:32:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-05 09:01:48 (GMT)
commit5884f1fe96b33d9666a78e660042b1e3e5f9f4d9 (patch)
treef621bb05ae6e20a8e07abeaf0f794fafa8343842
parentcaa87713bca77c441c09282aa5b18b179bcfa90d (diff)
downloadgit-5884f1fe96b33d9666a78e660042b1e3e5f9f4d9.zip
git-5884f1fe96b33d9666a78e660042b1e3e5f9f4d9.tar.gz
git-5884f1fe96b33d9666a78e660042b1e3e5f9f4d9.tar.bz2
Rename 'git-help--browse.sh' to 'git-web--browse.sh'.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-help.txt6
-rw-r--r--Makefile2
-rwxr-xr-xgit-web--browse.sh (renamed from git-help--browse.sh)0
-rw-r--r--help.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index fb77ca3..ad41aab 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
diff --git a/Makefile b/Makefile
index a03fd2e..d288378 100644
--- a/Makefile
+++ b/Makefile
@@ -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 8ed489d..8ed489d 100755
--- a/git-help--browse.sh
+++ b/git-web--browse.sh
diff --git a/help.c b/help.c
index 058a397..c35912b 100644
--- a/help.c
+++ b/help.c
@@ -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)