summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-06 11:00:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-06 11:00:46 -0700
commit606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d (patch)
treefd9957b9fef3c0165a0bb1b55708812c0395f12f /Documentation
parentMerge branch 'im/hashcmp-optim' (diff)
parentDocumentation: clarify meaning of --html-path, --man-path, and --info-path (diff)
downloadtgif-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.xz
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 'Documentation')
-rw-r--r--Documentation/git.txt14
1 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 78420b133a..f1292fc6ce 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -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>]
@@ -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::