Merge branch 'jn/preformatted-doc-url'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index cd213a7e3b36c6245668cb7a3ba0a458336e9fb0..38c3da2f7d3fa21506ebd553d3ed2ac311ab4a39 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -31,8 +31,8 @@ page to learn what commands Git offers.  You can learn more about
 individual Git commands with "git help command".  linkgit:gitcli[7]
 manual page gives you an overview of the command-line command syntax.
 
-Formatted and hyperlinked version of the latest Git documentation
-can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
+A formatted and hyperlinked copy of the latest Git documentation
+can be viewed at `https://git.github.io/htmldocs/git.html`.
 
 ifdef::stalenotes[]
 [NOTE]
@@ -43,6 +43,11 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
+* link:v2.9.0/git.html[documentation for release 2.9]
+
+* release notes for
+  link:RelNotes/2.9.0.txt[2.9].
+
 * link:v2.8.4/git.html[documentation for release 2.8.4]
 
 * release notes for
@@ -991,7 +996,7 @@ for further details.
        If this environment variable is set, then Git commands which need to
        acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
        will call this program with a suitable prompt as command-line argument
-       and read the password from its STDOUT. See also the 'core.askPass'
+       and read the password from its STDOUT. See also the `core.askPass`
        option in linkgit:git-config[1].
 
 `GIT_TERMINAL_PROMPT`::
@@ -1078,6 +1083,14 @@ of clones and fetches.
        cloning of shallow repositories.
        See `GIT_TRACE` for available trace output options.
 
+`GIT_TRACE_CURL`::
+       Enables a curl full trace dump of all incoming and outgoing data,
+       including descriptive information, of the git transport protocol.
+       This is similar to doing curl `--trace-ascii` on the command line.
+       This option overrides setting the `GIT_CURL_VERBOSE` environment
+       variable.
+       See `GIT_TRACE` for available trace output options.
+
 `GIT_LITERAL_PATHSPECS`::
        Setting this variable to `1` will cause Git to treat all
        pathspecs literally, rather than as glob patterns. For example,