summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-06 11:00:46 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-06 11:00:46 -0700
commit606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d (patch)
treefd9957b9fef3c0165a0bb1b55708812c0395f12f /git.c
parentefa67bfd16f4260275654bc4194744dd65353350 (diff)
parent239b5ed9c9b7b7f219b05c8d71e29db7b970eb48 (diff)
downloadgit-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.gz
Merge branch 'js/info-man-path'
* js/info-man-path: Documentation: clarify meaning of --html-path, --man-path, and --info-path git: add --info-path and --man-path options Conflicts: Makefile
Diffstat (limited to 'git.c')
-rw-r--r--git.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/git.c b/git.c
index ed899512f9..a5ef3c69ff 100644
--- a/git.c
+++ b/git.c
@@ -6,7 +6,7 @@
#include "run-command.h"
const char git_usage_string[] =
- "git [--version] [--exec-path[=<path>]] [--html-path]\n"
+ "git [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
" [-p|--paginate|--no-pager] [--no-replace-objects]\n"
" [--bare] [--git-dir=<path>] [--work-tree=<path>]\n"
" [-c name=value] [--help]\n"
@@ -95,6 +95,12 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
} else if (!strcmp(cmd, "--html-path")) {
puts(system_path(GIT_HTML_PATH));
exit(0);
+ } else if (!strcmp(cmd, "--man-path")) {
+ puts(system_path(GIT_MAN_PATH));
+ exit(0);
+ } else if (!strcmp(cmd, "--info-path")) {
+ puts(system_path(GIT_INFO_PATH));
+ exit(0);
} else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
use_pager = 1;
} else if (!strcmp(cmd, "--no-pager")) {