Skip to content

Commit

Permalink
Merge branch 'js/info-man-path'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Junio C Hamano committed May 6, 2011
2 parents efa67bf + 239b5ed commit 606ee4b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
14 changes: 11 additions & 3 deletions Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git - the stupid content tracker
SYNOPSIS
--------
[verse]
'git' [--version] [--exec-path[=<path>]] [--html-path]
'git' [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p|--paginate|--no-pager] [--no-replace-objects]
[--bare] [--git-dir=<path>] [--work-tree=<path>]
[-c <name>=<value>]
Expand Down Expand Up @@ -288,8 +288,16 @@ help ...`.
the current setting and then exit.

--html-path::
Print the path to wherever your git HTML documentation is installed
and exit.
Print the path, without trailing slash, where git's HTML
documentation is installed and exit.

--man-path::
Print the manpath (see `man(1)`) for the man pages for
this version of git and exit.

--info-path::
Print the path where the Info files documenting this
version of git are installed and exit.

-p::
--paginate::
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,9 @@ strip: $(PROGRAMS) git$X

git.o: common-cmds.h
git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \
'-DGIT_HTML_PATH="$(htmldir_SQ)"'
'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
'-DGIT_MAN_PATH="$(mandir_SQ)"' \
'-DGIT_INFO_PATH="$(infodir_SQ)"'

git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
Expand Down
8 changes: 7 additions & 1 deletion git.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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")) {
Expand Down

0 comments on commit 606ee4b

Please sign in to comment.