Autogenerated HTML docs for v2.48.1-404-g2d2a7

Author: gitster

RelNotes/2.49.0.adoc

@@ -33,6 +33,8 @@ UI, Workflows & Features
  * "git rev-list --missing=" learned to accept "print-info" that gives
    known details expected of the missing objects, like path and type.
 
+ * Comes with an updated "gitk".
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -217,3 +219,6 @@ Fixes since v2.48
    (merge 087740d65a ps/leakfixes-0129 later to maint).
    (merge 6bba6f604b jp/doc-trailer-config later to maint).
    (merge f1cc562b77 lo/t7603-path-is-file-update later to maint).
+   (merge 45761988ac en/doc-renormalize later to maint).
+   (merge 832f56f06a jc/doc-boolean-synonyms later to maint).
+   (merge 3eeed876a9 ac/doc-http-ssl-type-config later to maint).

git-config.adoc

@@ -213,7 +213,9 @@ See also <<FILES>>.
 +
 Valid `<type>`'s include:
 +
-- 'bool': canonicalize values as either "true" or "false".
+- 'bool': canonicalize values `true`, `yes`,`on`, and positive
+  numbers as "true", and values `false`, `no`, `off` and `0` as
+  "false".
 - 'int': canonicalize values as simple decimal numbers. An optional suffix of
   'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or
   1073741824 upon input.

git-config.html

@@ -728,7 +728,9 @@ <h2 id="OPTIONS">OPTIONS</h2>
 <div class="ulist">
 <ul>
 <li>
-<p><em>bool</em>: canonicalize values as either "true" or "false".</p>
+<p><em>bool</em>: canonicalize values <code>true</code>, <code>yes</code>,<code>on</code>, and positive
+numbers as "true", and values <code>false</code>, <code>no</code>, <code>off</code> and <code>0</code> as
+"false".</p>
 </li>
 <li>
 <p><em>int</em>: canonicalize values as simple decimal numbers. An optional suffix of
@@ -6016,6 +6018,23 @@ <h3 id="_variables">Variables</h3>
 This option is ignored if cURL lacks support for choosing the SSL
 backend at runtime.</p>
 </dd>
+<dt class="hdlist1">http.sslCertType</dt>
+<dd>
+<p>Type of client certificate used when fetching or pushing over HTTPS.
+"PEM", "DER" are supported when using openssl or gnutls backends. "P12"
+is supported on "openssl", "schannel", "securetransport", and gnutls 8.11+.
+See also libcurl <code>CURLOPT_SSLCERTTYPE</code>. Can be overridden by the
+<code>GIT_SSL_CERT_TYPE</code> environment variable.</p>
+</dd>
+<dt class="hdlist1">http.sslKeyType</dt>
+<dd>
+<p>Type of client private key used when fetching or pushing over HTTPS. (e.g.
+"PEM", "DER", or "ENG"). Only applicable when using "openssl" backend. "DER"
+is not supported with openssl. Particularly useful when set to "ENG" for
+authenticating with PKCS#11 tokens, with a PKCS#11 URL in sslCert option.
+See also libcurl <code>CURLOPT_SSLKEYTYPE</code>. Can be overridden by the
+<code>GIT_SSL_KEY_TYPE</code> environment variable.</p>
+</dd>
 <dt class="hdlist1">http.schannelCheckRevoke</dt>
 <dd>
 <p>Used to enforce or disable certificate revocation checks in cURL
@@ -6699,7 +6718,8 @@ <h3 id="_variables">Variables</h3>
 <p>Tell Git that canonical representation of files in the
 repository has changed over time (e.g. earlier commits record
 text files with CRLF line endings, but recent ones use LF line
-endings).  In such a repository, Git can convert the data
+endings).  In such a repository, for each file where a
+three-way content merge is needed, Git can convert the data
 recorded in commits to a canonical form before performing a
 merge to reduce unnecessary conflicts.  For more information,
 see section "Merging branches with differing checkin/checkout
@@ -9597,7 +9617,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-02-21 13:44:53 -0800
 </div>
 </div>
 </body>

git-diff-tree.html

@@ -2320,10 +2320,10 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </table>
 </div>
 <div class="paragraph">
-<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The values
-<code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean
-option is given with no value, it&#8217;s enabled.</p>
+<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The
+values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+are all accepted.  Giving a boolean option without <code>=</code><em>&lt;value&gt;</em> is
+equivalent to giving it with <code>=true</code>.</p>
 </div>
 <div class="paragraph">
 <p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed

git-log.html

@@ -2683,10 +2683,10 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </table>
 </div>
 <div class="paragraph">
-<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The values
-<code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean
-option is given with no value, it&#8217;s enabled.</p>
+<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The
+values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+are all accepted.  Giving a boolean option without <code>=</code><em>&lt;value&gt;</em> is
+equivalent to giving it with <code>=true</code>.</p>
 </div>
 <div class="paragraph">
 <p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed

git-merge.html

@@ -1231,7 +1231,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 <dt class="hdlist1">renormalize</dt>
 <dd>
 <p>This runs a virtual check-out and check-in of all three stages
-of a file when resolving a three-way merge.  This option is
+of any file which needs a three-way merge.  This option is
 meant to be used when merging branches with different clean
 filters or end-of-line normalization rules.  See "Merging
 branches with differing checkin/checkout attributes" in
@@ -1476,7 +1476,8 @@ <h2 id="_configuration">CONFIGURATION</h2>
 <p>Tell Git that canonical representation of files in the
 repository has changed over time (e.g. earlier commits record
 text files with CRLF line endings, but recent ones use LF line
-endings).  In such a repository, Git can convert the data
+endings).  In such a repository, for each file where a
+three-way content merge is needed, Git can convert the data
 recorded in commits to a canonical form before performing a
 merge to reduce unnecessary conflicts.  For more information,
 see section "Merging branches with differing checkin/checkout

git-pull.html

@@ -1562,7 +1562,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 <dt class="hdlist1">renormalize</dt>
 <dd>
 <p>This runs a virtual check-out and check-in of all three stages
-of a file when resolving a three-way merge.  This option is
+of any file which needs a three-way merge.  This option is
 meant to be used when merging branches with different clean
 filters or end-of-line normalization rules.  See "Merging
 branches with differing checkin/checkout attributes" in

git-rebase.html

@@ -1619,7 +1619,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 <dt class="hdlist1">renormalize</dt>
 <dd>
 <p>This runs a virtual check-out and check-in of all three stages
-of a file when resolving a three-way merge.  This option is
+of any file which needs a three-way merge.  This option is
 meant to be used when merging branches with different clean
 filters or end-of-line normalization rules.  See "Merging
 branches with differing checkin/checkout attributes" in

git-rev-list.html

@@ -2797,10 +2797,10 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </table>
 </div>
 <div class="paragraph">
-<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The values
-<code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean
-option is given with no value, it&#8217;s enabled.</p>
+<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The
+values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+are all accepted.  Giving a boolean option without <code>=</code><em>&lt;value&gt;</em> is
+equivalent to giving it with <code>=true</code>.</p>
 </div>
 <div class="paragraph">
 <p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed

git-show.html

@@ -1323,10 +1323,10 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </table>
 </div>
 <div class="paragraph">
-<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The values
-<code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean
-option is given with no value, it&#8217;s enabled.</p>
+<p>The boolean options accept an optional value [<code>=</code><em>&lt;bool-value&gt;</em>]. The
+values taken by <code>--type=bool</code> git-config[1], like <code>yes</code> and <code>off</code>,
+are all accepted.  Giving a boolean option without <code>=</code><em>&lt;value&gt;</em> is
+equivalent to giving it with <code>=true</code>.</p>
 </div>
 <div class="paragraph">
 <p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed

git.adoc

@@ -472,8 +472,9 @@ Environment Variables
 ---------------------
 Various Git commands pay attention to environment variables and change
 their behavior.  The environment variables marked as "Boolean" take
-their values the same way as Boolean valued configuration variables, e.g.
-"true", "yes", "on" and positive numbers are taken as "yes".
+their values the same way as Boolean valued configuration variables, i.e.,
+"true", "yes", "on" and positive numbers are taken as "yes", while "false",
+"no", "off", and "0" are taken as "no".
 
 Here are the variables:
 

git.html

@@ -1803,8 +1803,9 @@ <h2 id="_environment_variables">Environment Variables</h2>
 <div class="paragraph">
 <p>Various Git commands pay attention to environment variables and change
 their behavior.  The environment variables marked as "Boolean" take
-their values the same way as Boolean valued configuration variables, e.g.
-"true", "yes", "on" and positive numbers are taken as "yes".</p>
+their values the same way as Boolean valued configuration variables, i.e.,
+"true", "yes", "on" and positive numbers are taken as "yes", while "false",
+"no", "off", and "0" are taken as "no".</p>
 </div>
 <div class="paragraph">
 <p>Here are the variables:</p>
@@ -2694,7 +2695,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-02-21 13:44:53 -0800
 </div>
 </div>
 </body>

gitattributes.adoc

@@ -701,8 +701,8 @@ where the attribute is not in place would normally cause merge
 conflicts.
 
 To prevent these unnecessary merge conflicts, Git can be told to run a
-virtual check-out and check-in of all three stages of a file when
-resolving a three-way merge by setting the `merge.renormalize`
+virtual check-out and check-in of all three stages of each file that
+needs a three-way content merge, by setting the `merge.renormalize`
 configuration variable.  This prevents changes caused by check-in
 conversion from causing spurious merge conflicts when a converted file
 is merged with an unconverted file.

gitattributes.html

@@ -1290,8 +1290,8 @@ <h4 id="_merging_branches_with_differing_checkincheckout_attributes">Merging bra
 </div>
 <div class="paragraph">
 <p>To prevent these unnecessary merge conflicts, Git can be told to run a
-virtual check-out and check-in of all three stages of a file when
-resolving a three-way merge by setting the <code>merge.renormalize</code>
+virtual check-out and check-in of all three stages of each file that
+needs a three-way content merge, by setting the <code>merge.renormalize</code>
 configuration variable.  This prevents changes caused by check-in
 conversion from causing spurious merge conflicts when a converted file
 is merged with an unconverted file.</p>
@@ -2125,7 +2125,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-02-14 21:38:14 -0800
+Last updated 2025-02-21 13:44:53 -0800
 </div>
 </div>
 </body>

merge-strategies.adoc

@@ -56,7 +56,7 @@ ignore-cr-at-eol;;
 
 renormalize;;
 	This runs a virtual check-out and check-in of all three stages
-	of a file when resolving a three-way merge.  This option is
+	of any file which needs a three-way merge.  This option is
 	meant to be used when merging branches with different clean
 	filters or end-of-line normalization rules.  See "Merging
 	branches with differing checkin/checkout attributes" in

pretty-formats.adoc

@@ -339,10 +339,10 @@ insert an empty string unless we are traversing reflog entries (e.g., by
 decoration format if `--decorate` was not already provided on the command
 line.
 
-The boolean options accept an optional value `[=<bool-value>]`. The values
-`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
-sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
-option is given with no value, it's enabled.
+The boolean options accept an optional value `[=<bool-value>]`. The
+values taken by `--type=bool` git-config[1], like `yes` and `off`,
+are all accepted.  Giving a boolean option without `=<value>` is
+equivalent to giving it with `=true`.
 
 If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
 is inserted immediately before the expansion if and only if the