diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:35:55 -0700 |
| commit | ba22efd8f5d9bd946925e72b5e6ede91ce2ec9be (patch) | |
| tree | d3ea10c950539813a629e01cb4e0c00ee6f41317 /builtin | |
| parent | bde42f081e68030505f59186ae036b2bbbd94ce8 (diff) | |
| parent | 6db5967d4e6640c5a3ee3cde151c5fdde5ab508f (diff) | |
| download | git-ba22efd8f5d9bd946925e72b5e6ede91ce2ec9be.tar.gz git-ba22efd8f5d9bd946925e72b5e6ede91ce2ec9be.tar.xz | |
Merge branch 'js/no-html-bypass-on-windows' into maint
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 88480131c..e8f79d7af 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) { |