Autogenerated HTML docs for v2.33.0-328-g8b7c1

1 files changed, 50 insertions, 14 deletions

diff --git a/git-config.html b/git-config.html
index f442117d7..496469ab7 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1967,6 +1967,15 @@ pushRefNeedsUpdate
 </p>

 </dd>

 <dt class="hdlist1">

+skippedCherryPicks

+</dt>

+<dd>

+<p>

+                Shown when <a href="git-rebase.html">git-rebase(1)</a> skips a commit that has already

+                been cherry-picked onto the upstream branch.

+</p>

+</dd>

+<dt class="hdlist1">

 statusAheadBehind

 </dt>

 <dd>

@@ -5956,7 +5965,7 @@ gui.encoding
 </dt>

 <dd>

 <p>

-        Specifies the default encoding to use for displaying of

+        Specifies the default character encoding to use for displaying of

         file contents in <a href="git-gui.html">git-gui(1)</a> and <a href="gitk.html">gitk(1)</a>.

         It can be overridden by setting the <em>encoding</em> attribute

         for relevant files (see <a href="gitattributes.html">gitattributes(5)</a>).

@@ -6168,14 +6177,38 @@ help.autoCorrect
 <dd>

 <p>

         If git detects typos and can identify exactly one valid command similar

-        to the error, git will automatically run the intended command after

-        waiting a duration of time defined by this configuration value in

-        deciseconds (0.1 sec).  If this value is 0, the suggested corrections

-        will be shown, but not executed. If it is a negative integer, or

-        "immediate", the suggested command

-        is run immediately. If "never", suggestions are not shown at all. The

-        default value is zero.

+        to the error, git will try to suggest the correct command or even

+        run the suggestion automatically. Possible config values are:

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+0 (default): show the suggested command.

+</p>

+</li>

+<li>

+<p>

+positive number: run the suggested command after specified

+deciseconds (0.1 sec).

 </p>

+</li>

+<li>

+<p>

+"immediate": run the suggested command immediately.

+</p>

+</li>

+<li>

+<p>

+"prompt": show the suggestion and prompt for confirmation to run

+the command.

+</p>

+</li>

+<li>

+<p>

+"never": don&#8217;t run or show any suggested command.

+</p>

+</li>

+</ul></div>

 </dd>

 <dt class="hdlist1">

 help.htmlPath

@@ -10021,13 +10054,16 @@ explicitly exposing it, even if an earlier entry marked it as hidden.
 If you have multiple hideRefs values, later entries override earlier ones

 (and entries in more-specific config files override less-specific ones).</p></div>

 <div class="paragraph"><p>If a namespace is in use, the namespace prefix is stripped from each

-reference before it is matched against <code>transfer.hiderefs</code> patterns.

-For example, if <code>refs/heads/master</code> is specified in <code>transfer.hideRefs</code> and

+reference before it is matched against <code>transfer.hiderefs</code> patterns. In

+order to match refs before stripping, add a <code>^</code> in front of the ref name. If

+you combine <code>!</code> and <code>^</code>, <code>!</code> must be specified first.</p></div>

+<div class="paragraph"><p>For example, if <code>refs/heads/master</code> is specified in <code>transfer.hideRefs</code> and

 the current namespace is <code>foo</code>, then <code>refs/namespaces/foo/refs/heads/master</code>

-is omitted from the advertisements but <code>refs/heads/master</code> and

-<code>refs/namespaces/bar/refs/heads/master</code> are still advertised as so-called

-"have" lines. In order to match refs before stripping, add a <code>^</code> in front of

-the ref name. If you combine <code>!</code> and <code>^</code>, <code>!</code> must be specified first.</p></div>

+is omitted from the advertisements. If <code>uploadpack.allowRefInWant</code> is set,

+<code>upload-pack</code> will treat <code>want-ref refs/heads/master</code> in a protocol v2

+<code>fetch</code> command as if <code>refs/namespaces/foo/refs/heads/master</code> did not exist.

+<code>receive-pack</code>, on the other hand, will still advertise the object id the

+ref is pointing to without mentioning its name (a so-called ".have" line).</p></div>

 <div class="paragraph"><p>Even if you hide refs, a client may still be able to steal the target

 objects via the techniques described in the "SECURITY" section of the

 <a href="gitnamespaces.html">gitnamespaces(7)</a> man page; it&#8217;s best to keep private data in a