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>

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index fb77ca3a57d9377e8939c6d32601cf1386f0261b..ad41aabeb0ec85cd1ee3d67e9496111f2a4cfc3b 100644 (file)
--- 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 a03fd2e9c93dfa583a4cfefb6cf2e4c909b3c9c1..d288378aa18677f575b83b07809b4f438ddfcdaa 100644 (file)
--- 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
similarity index 100%
rename from git-help--browse.sh
rename to git-web--browse.sh

diff --git a/help.c b/help.c
index 058a397534e82c0b4eab447ba827ef8cb1919320..c35912bc553ce1c9dbb912a2ff8d9464ca51c3bf 100644 (file)
--- 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)