Merge branch 'jk/maint-1.6.3-ls-files-no-ignore-cached' into maint-1.6.4

diff --git a/builtin-help.c b/builtin-help.c
index 6e53b23833062249485124b827da348a8be206b0..e1eba778a526f500b0a65a6b112e468f04a3f869 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -394,7 +394,7 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
  * HTML.
  */
 #ifndef open_html
-void open_html(const char *path)
+static void open_html(const char *path)
 {
        execl_git_cmd("web--browse", "-c", "help.browser", path, NULL);
 }