diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:32:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:32:51 -0700 |
commit | d65279d5bf02f3c457a843c8586752714f42e75a (patch) | |
tree | e7ad0fdc8677f06a20622bc73345ef7718be90ea /git.c | |
parent | 982962ce24c7d614d94f40de54cfcfdf71dcb0d2 (diff) | |
parent | 89a56bfbd3fd855cb0c2a381520e6255de41a55e (diff) | |
download | git-d65279d5bf02f3c457a843c8586752714f42e75a.tar.gz |
Merge branch 'mh/html-path'
* mh/html-path:
add --html-path to get the location of installed HTML docs
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -5,7 +5,7 @@ #include "run-command.h" const char git_usage_string[] = - "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]"; + "git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path] [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]"; const char git_more_info_string[] = "See 'git help COMMAND' for more information on a specific command."; @@ -75,6 +75,9 @@ static int handle_options(const char*** argv, int* argc, int* envchanged) puts(git_exec_path()); exit(0); } + } else if (!strcmp(cmd, "--html-path")) { + puts(system_path(GIT_HTML_PATH)); + exit(0); } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) { use_pager = 1; } else if (!strcmp(cmd, "--no-pager")) { |