Merge branch 'sb/doc-upstream-branch'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7513c57c6a3d4c6dfd853a48f438ee55b9244894..2ce5e6b451aaf3705d2aad2a64ce3e3e45827f83 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[=GIT_EXEC_PATH]]
+'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
     [-p|--paginate|--no-pager]
     [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
     [--help] COMMAND [ARGS]
@@ -178,6 +178,10 @@ help ...`.
        environment variable. If no path is given, 'git' will print
        the current setting and then exit.
 
+--html-path::
+       Print the path to wherever your git HTML documentation is installed
+       and exit.
+
 -p::
 --paginate::
        Pipe all output into 'less' (or if set, $PAGER).