summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-15 06:02:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-15 06:04:43 (GMT)
commit5b4617c7490921f3ea871231f71d6baa2288bf93 (patch)
treef1e2cddb4fde124903f84e44f0557d2667e79655
parent70087cdbd3671f5929689a9b77f414b8297641c2 (diff)
downloadgit-5b4617c7490921f3ea871231f71d6baa2288bf93.zip
git-5b4617c7490921f3ea871231f71d6baa2288bf93.tar.gz
git-5b4617c7490921f3ea871231f71d6baa2288bf93.tar.bz2
Rename git-browse-help helper to git-browse--help
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.gitignore2
-rw-r--r--Documentation/git-help.txt6
-rw-r--r--Makefile7
-rwxr-xr-xgit-browse--help.sh (renamed from git-browse-help.sh)0
-rw-r--r--help.c2
5 files changed, 8 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 5eaba41..aef01c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ git-archive
git-bisect
git-blame
git-branch
-git-browse-help
+git-browse--help
git-bundle
git-cat-file
git-check-attr
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 31ec403..8cd69e7 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -47,13 +47,13 @@ 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-browse-help' script (called by
-'git-help') will pick a suitable default.
+these config variables is set, the 'git-browse--help' helper script
+(called by 'git-help') will pick a suitable default.
+
You can explicitly provide a full path to your prefered 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-browse-help' assumes the tool
+'browser.firefox.path'. Otherwise, 'git-browse--help' assumes the tool
is available in PATH.
+
Note that the script tries, as much as possible, to display the HTML
diff --git a/Makefile b/Makefile
index 16de2f3..43d6197 100644
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@ SCRIPT_SH = \
git-lost-found.sh git-quiltimport.sh git-submodule.sh \
git-filter-branch.sh \
git-stash.sh \
- git-browse-help.sh
+ git-browse--help.sh
SCRIPT_PERL = \
git-add--interactive.perl \
@@ -1144,9 +1144,8 @@ check-docs::
case "$$v" in \
git-merge-octopus | git-merge-ours | git-merge-recursive | \
git-merge-resolve | git-merge-stupid | git-merge-subtree | \
- git-add--interactive | git-fsck-objects | git-init-db | \
- git-rebase--interactive | \
- git-repo-config | git-fetch--tool ) continue ;; \
+ git-fsck-objects | git-init-db | git-repo-config | \
+ git-?*--?* ) continue ;; \
esac ; \
test -f "Documentation/$$v.txt" || \
echo "no doc: $$v"; \
diff --git a/git-browse-help.sh b/git-browse--help.sh
index 10b0a36..10b0a36 100755
--- a/git-browse-help.sh
+++ b/git-browse--help.sh
diff --git a/help.c b/help.c
index 551b5b9..f9ce6db 100644
--- a/help.c
+++ b/help.c
@@ -331,7 +331,7 @@ static void show_info_page(const char *git_cmd)
static void show_html_page(const char *git_cmd)
{
const char *page = cmd_to_page(git_cmd);
- execl_git_cmd("browse-help", page, NULL);
+ execl_git_cmd("browse--help", page, NULL);
}
void help_unknown_cmd(const char *cmd)