Merge branch 'jc/maint-reset-unmerged-path' into maint

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7fc6b88b96715bf65597b457163254788580a227..0172cd70149914897862fbf0f3f221c7ef31ea5c 100644 (file)
--- 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>]
@@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v1.7.6/git.html[documentation for release 1.7.6]
+
+* release notes for
+  link:RelNotes/1.7.6.txt[1.7.6].
+
 * link:v1.7.5.4/git.html[documentation for release 1.7.5.4]
 
 * release notes for
@@ -291,8 +296,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::