From: Junio C Hamano Date: Fri, 20 May 2011 03:37:08 +0000 (-0700) Subject: Merge 1.7.5.2 in X-Git-Tag: v1.7.6-rc0~59 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7b11753402e17be4a3fae47a0aaf616b93cd5028?ds=inline;hp=-c Merge 1.7.5.2 in Signed-off-by: Junio C Hamano --- 7b11753402e17be4a3fae47a0aaf616b93cd5028 diff --combined Documentation/git.txt index f1292fc6ce,e639c8315d..19d4deff70 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -9,7 -9,7 +9,7 @@@ git - the stupid content tracke SYNOPSIS -------- [verse] -'git' [--version] [--exec-path[=]] [--html-path] +'git' [--version] [--exec-path[=]] [--html-path] [--man-path] [--info-path] [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] [--git-dir=] [--work-tree=] [-c =] @@@ -44,9 -44,10 +44,10 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: - * link:v1.7.5.1/git.html[documentation for release 1.7.5.1] + * link:v1.7.5.2/git.html[documentation for release 1.7.5.2] * release notes for + link:RelNotes/1.7.5.2.txt[1.7.5.2], link:RelNotes/1.7.5.1.txt[1.7.5.1], link:RelNotes/1.7.5.txt[1.7.5]. @@@ -288,16 -289,8 +289,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::