diff options
Diffstat (limited to 'builtin-help.c')
| -rw-r--r-- | builtin-help.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin-help.c b/builtin-help.c index 391f749376..64207cbfe9 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -273,7 +273,7 @@ static int git_help_config(const char *var, const char *value, void *cb) return git_default_config(var, value, cb); } -struct cmdnames main_cmds, other_cmds; +static struct cmdnames main_cmds, other_cmds; void list_common_cmds_help(void) { @@ -361,12 +361,15 @@ static void show_man_page(const char *git_cmd) { struct man_viewer_list *viewer; const char *page = cmd_to_page(git_cmd); + const char *fallback = getenv("GIT_MAN_VIEWER"); setup_man_path(); for (viewer = man_viewer_list; viewer; viewer = viewer->next) { exec_viewer(viewer->name, page); /* will return when unable */ } + if (fallback) + exec_viewer(fallback, page); exec_viewer("man", page); die("no man viewer handled the request"); } @@ -418,7 +421,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) { int nongit; const char *alias; - unsigned int longest = load_command_list("git-", &main_cmds, &other_cmds); + load_command_list("git-", &main_cmds, &other_cmds); setup_git_directory_gently(&nongit); git_config(git_help_config, NULL); @@ -428,7 +431,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) if (show_all) { printf("usage: %s\n\n", git_usage_string); - list_commands("git commands", longest, &main_cmds, &other_cmds); + list_commands("git commands", &main_cmds, &other_cmds); printf("%s\n", git_more_info_string); return 0; } |