Autogenerated HTML docs for v2.26.2-266-ge8703

1 files changed, 27 insertions, 5 deletions

diff --git a/git-config.html b/git-config.html
index b5e419316..5a1b227d2 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1678,11 +1678,9 @@ Note that "../" is not special and will match literally, which is
 ; file (if the condition is true); their location is not

 ; affected by the condition

 [includeIf "gitdir:/path/to/group/"]

-        path = foo.inc</code></pre>

-</div></div>

-<div class="literalblock">

-<div class="content">

-<pre><code>; include only if we are in a worktree where foo-branch is

+        path = foo.inc

+

+; include only if we are in a worktree where foo-branch is

 ; currently checked out

 [includeIf "onbranch:foo-branch"]

         path = foo.inc</code></pre>

@@ -4970,6 +4968,16 @@ format.suffix
 </p>

 </dd>

 <dt class="hdlist1">

+format.encodeEmailHeaders

+</dt>

+<dd>

+<p>

+        Encode email headers that have non-ASCII characters with

+        "Q-encoding" (described in RFC 2047) for email transmission.

+        Defaults to true.

+</p>

+</dd>

+<dt class="hdlist1">

 format.pretty

 </dt>

 <dd>

@@ -9288,6 +9296,20 @@ trace2.configParams
 </p>

 </dd>

 <dt class="hdlist1">

+trace2.envVars

+</dt>

+<dd>

+<p>

+        A comma-separated list of "important" environment variables that should

+        be recorded in the trace2 output.  For example,

+        <code>GIT_HTTP_USER_AGENT,GIT_CONFIG</code> would cause the trace2 output to

+        contain events listing the overrides for HTTP user agent and the

+        location of the Git configuration file (assuming any are set).  May be

+        overriden by the <code>GIT_TRACE2_ENV_VARS</code> environment variable.  Unset by

+        default.

+</p>

+</dd>

+<dt class="hdlist1">

 trace2.destinationDebug

 </dt>

 <dd>