summaryrefslogtreecommitdiff
path: root/builtin/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-26 18:29:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-26 18:29:07 (GMT)
commit3b1c6a9b6ef3a1b26f24439436a09482a3618ff3 (patch)
tree4341fdab964965970947f2eb90354cca809f5c0a /builtin/help.c
parente0c1ceafc5bece92d35773a75fff59497e1d9bd5 (diff)
parent6db5967d4e6640c5a3ee3cde151c5fdde5ab508f (diff)
downloadgit-3b1c6a9b6ef3a1b26f24439436a09482a3618ff3.zip
git-3b1c6a9b6ef3a1b26f24439436a09482a3618ff3.tar.gz
git-3b1c6a9b6ef3a1b26f24439436a09482a3618ff3.tar.bz2
Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknown
* js/no-html-bypass-on-windows: Revert "display HTML in default browser using Windows' shell API"
Diffstat (limited to 'builtin/help.c')
-rw-r--r--builtin/help.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/help.c b/builtin/help.c
index 8848013..e8f79d7 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)
{