Commit 89a56bfb authored by Markus Heidelberg's avatar Markus Heidelberg Committed by Junio C Hamano

add --html-path to get the location of installed HTML docs

This can be used in GUIs to open installed HTML documentation in the
Signed-off-by: Markus Heidelberg's avatarMarkus Heidelberg <>
Signed-off-by: default avatarJunio C Hamano <>
parent e96f3689
......@@ -9,7 +9,7 @@ git - the stupid content tracker
'git' [--version] [--exec-path[=GIT_EXEC_PATH]]
'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
[--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
[--help] COMMAND [ARGS]
......@@ -178,6 +178,10 @@ help ...`.
environment variable. If no path is given, 'git' will print
the current setting and then exit.
Print the path to wherever your git HTML documentation is installed
and exit.
Pipe all output into 'less' (or if set, $PAGER).
......@@ -1191,6 +1191,7 @@ strip: $(PROGRAMS) git$X
git.o: git.c common-cmds.h GIT-CFLAGS
'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
$(ALL_CFLAGS) -c $(filter %.c,$^)
git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
......@@ -1870,6 +1870,7 @@ _git ()
......@@ -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)
} else if (!strcmp(cmd, "--html-path")) {
} else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
use_pager = 1;
} else if (!strcmp(cmd, "--no-pager")) {
......@@ -56,7 +56,7 @@ =head1 SYNOPSIS
@EXPORT_OK = qw(command command_oneline command_noisy
command_output_pipe command_input_pipe command_close_pipe
command_bidi_pipe command_close_bidi_pipe
version exec_path hash_object git_cmd_try
version exec_path html_path hash_object git_cmd_try
temp_acquire temp_release temp_reset temp_path);
......@@ -492,6 +492,16 @@ sub version {
sub exec_path { command_oneline('--exec-path') }
=item html_path ()
Return path to the Git html documentation (the same as
C<git --html-path>). Useful mostly only internally.
sub html_path { command_oneline('--html-path') }
=item repo_path ()
Return path to the git repository. Must be called on a repository instance.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment