Skip to content

Commit

Permalink
Rename git-browse-help helper to git-browse--help
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Dec 15, 2007
1 parent 70087cd commit 5b4617c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Documentation/git-help.txt
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions Makefile
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"; \
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion help.c
Expand Up @@ -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)
Expand Down

0 comments on commit 5b4617c

Please sign in to comment.