Autogenerated HTML docs for v2.32.0-452-g940fe

1 files changed, 10 insertions, 15 deletions

diff --git a/git-config.html b/git-config.html
index 3b522edc0..7bb8e5c8e 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4427,9 +4427,10 @@ diff.renameLimit
 </dt>

 <dd>

 <p>

-        The number of files to consider when performing the copy/rename

-        detection; equivalent to the <em>git diff</em> option <code>-l</code>. This setting

-        has no effect if rename detection is turned off.

+        The number of files to consider in the exhaustive portion of

+        copy/rename detection; equivalent to the <em>git diff</em> option

+        <code>-l</code>.  If not set, the default value is currently 1000.  This

+        setting has no effect if rename detection is turned off.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -7382,10 +7383,12 @@ merge.renameLimit
 </dt>

 <dd>

 <p>

-        The number of files to consider when performing rename detection

-        during a merge; if not specified, defaults to the value of

-        diff.renameLimit. This setting has no effect if rename detection

-        is turned off.

+        The number of files to consider in the exhaustive portion of

+        rename detection during a merge.  If not specified, defaults

+        to the value of diff.renameLimit.  If neither

+        merge.renameLimit nor diff.renameLimit are specified,

+        currently defaults to 7000.  This setting has no effect if

+        rename detection is turned off.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -9165,14 +9168,6 @@ sendemail.smtpEncryption
 </p>

 </dd>

 <dt class="hdlist1">

-sendemail.smtpssl (deprecated)

-</dt>

-<dd>

-<p>

-        Deprecated alias for <em>sendemail.smtpEncryption = ssl</em>.

-</p>

-</dd>

-<dt class="hdlist1">

 sendemail.smtpsslcertpath

 </dt>

 <dd>