diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-25 13:55:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-25 13:55:06 -0700 |
| commit | 13e11ff707b18599dc94c25885b33b0c514b1c17 (patch) | |
| tree | 7c44e79239ea5bda41ec13c87e23a8a8e6f1a681 /builtin | |
| parent | Merge branch 'hv/doc-commit-reference-style' (diff) | |
| parent | Revert "display HTML in default browser using Windows' shell API" (diff) | |
| download | tgif-13e11ff707b18599dc94c25885b33b0c514b1c17.tar.xz | |
Merge branch 'js/no-html-bypass-on-windows'
On Windows, help.browser configuration variable used to be ignored,
which has been corrected.
* js/no-html-bypass-on-windows:
Revert "display HTML in default browser using Windows' shell API"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/help.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/help.c b/builtin/help.c index 88480131cf..e8f79d7af5 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -379,17 +379,10 @@ static void get_html_page_path(struct strbuf *page_path, const char *page) free(to_free); } -/* - * If open_html is not defined in a platform-specific way (see for - * example compat/mingw.h), we use the script web--browse to display - * HTML. - */ -#ifndef open_html static void open_html(const char *path) { execl_git_cmd("web--browse", "-c", "help.browser", path, (char *)NULL); } -#endif static void show_html_page(const char *git_cmd) { |