Merge branch 'es/check-non-portable-pre-5.10'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 6d1f2fd9ae9e993e46d935f835bdfec4e6f686e1..72adfcc5e24b783f6924655088a968a5357b188e 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -660,6 +660,27 @@ of clones and fetches.
        When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump
        data (that is, only dump info lines and headers).
 
+`GIT_TR2`::
+       Enables more detailed trace messages from the "trace2" library.
+       Output from `GIT_TR2` is a simple text-based format for human
+       readability.
++
+The `GIT_TR2` variables can take many values. Any value available to
+the `GIT_TRACE` variables is also available to `GIT_TR2`. The `GIT_TR2`
+variables can also specify a Unix Domain Socket. See
+link:technical/api-trace2.html[Trace2 documentation] for full details.
+
+`GIT_TR2_EVENT`::
+       This setting writes a JSON-based format that is suited for machine
+       interpretation. See link:technical/api-trace2.html[Trace2 documentation]
+       for full details.
+
+`GIT_TR2_PERF`::
+       In addition to the text-based messages available in `GIT_TR2`, this
+       setting writes a column-based format for understanding nesting
+       regions. See link:technical/api-trace2.html[Trace2 documentation]
+       for full details.
+
 `GIT_REDACT_COOKIES`::
        This can be set to a comma-separated list of strings. When a curl trace
        is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header