Autogenerated HTML docs for v2.48.1-76-g4e746
diff --git a/RelNotes/2.49.0.txt b/RelNotes/2.49.0.txt
index dbdec19..26fe1a0 100644
--- a/RelNotes/2.49.0.txt
+++ b/RelNotes/2.49.0.txt
@@ -4,6 +4,8 @@
UI, Workflows & Features
------------------------
+ * Completion script updates for zsh
+
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
@@ -12,6 +14,13 @@
* meson-based build now supports the unsafe-sha1 build knob.
+ * The code to check LSan results has been simplified and made more
+ robust.
+ (merge 164a2516eb jk/lsan-race-ignore-false-positive later to maint).
+
+ * More code paths have a repository passed through the callchain,
+ instead of assuming the primary the_repository object.
+
Fixes since v2.48
-----------------
@@ -30,4 +39,17 @@
to.
(merge d7fcbe2c56 ps/object-collision-check later to maint).
+ * The code to compute "unique" name used git_rand() which can fail or
+ get stuck; the callsite does not require cryptographic security.
+ Introduce the "insecure" mode and use it appropriately.
+ (merge 0b4f8afef6 ps/reftable-get-random-fix later to maint).
+
+ * A misconfigured "fsck.skiplist" configuration variable was not
+ diagnosed as an error, which has been corrected.
+ (merge ca7158076f jt/fsck-skiplist-parse-fix later to maint).
+
* Other code cleanup, docfix, build fix, etc.
+ (merge ddb5287894 jk/t7407-use-test-grep later to maint).
+ (merge 21e1b44865 aj/difftool-config-doc-fix later to maint).
+ (merge 6a63995335 mh/gitattr-doc-markup-fix later to maint).
+ (merge 43850dcf9c sk/unit-test-hash later to maint).
diff --git a/git-config.html b/git-config.html
index f671642..bfa8d93 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4196,6 +4196,83 @@
<dd>
<p>Set this option to <code>true</code> to make the diff driver cache the text
conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.</p>
+</dd>
+<dt class="hdlist1"><code>diff.indentHeuristic</code></dt>
+<dd>
+<p>Set this option to <code>false</code> to disable the default heuristics
+that shift diff hunk boundaries to make patches easier to read.</p>
+</dd>
+<dt class="hdlist1"><code>diff.algorithm</code></dt>
+<dd>
+<p>Choose a diff algorithm. The variants are as follows:</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>default</code></dt>
+<dt class="hdlist1"><code>myers</code></dt>
+<dd>
+<p>The basic greedy diff algorithm. Currently, this is the default.</p>
+</dd>
+<dt class="hdlist1"><code>minimal</code></dt>
+<dd>
+<p>Spend extra time to make sure the smallest possible diff is
+produced.</p>
+</dd>
+<dt class="hdlist1"><code>patience</code></dt>
+<dd>
+<p>Use "patience diff" algorithm when generating patches.</p>
+</dd>
+<dt class="hdlist1"><code>histogram</code></dt>
+<dd>
+<p>This algorithm extends the patience algorithm to "support
+low-occurrence common elements".</p>
+</dd>
+</dl>
+</div>
+</div>
+</div>
+</dd>
+<dt class="hdlist1"><code>diff.wsErrorHighlight</code></dt>
+<dd>
+<p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
+lines of the diff. Multiple values are separated by comma,
+<code>none</code> resets previous values, <code>default</code> reset the list to
+<code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. The
+whitespace errors are colored with <code>color.diff.whitespace</code>.
+The command line option <code>--ws-error-highlight=</code><em><kind></em>
+overrides this setting.</p>
+</dd>
+<dt class="hdlist1"><code>diff.colorMoved</code></dt>
+<dd>
+<p>If set to either a valid <em><mode></em> or a <code>true</code> value, moved lines
+in a diff are colored differently.
+For details of valid modes see <code>--color-moved</code> in <a href="git-diff.html">git-diff(1)</a>.
+If simply set to <code>true</code> the default color mode will be used. When
+set to <code>false</code>, moved lines are not colored.</p>
+</dd>
+<dt class="hdlist1"><code>diff.colorMovedWS</code></dt>
+<dd>
+<p>When moved lines are colored using e.g. the <code>diff.colorMoved</code> setting,
+this option controls the mode how spaces are treated.
+For details of valid modes see <code>--color-moved-ws</code> in <a href="git-diff.html">git-diff(1)</a>.</p>
+</dd>
+<dt class="hdlist1">diff.tool</dt>
+<dd>
+<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
+This variable overrides the value configured in <code>merge.tool</code>.
+The list below shows the valid built-in values.
+Any other value is treated as a custom diff tool and requires
+that a corresponding difftool.<tool>.cmd variable is defined.</p>
+</dd>
+<dt class="hdlist1">diff.guitool</dt>
+<dd>
+<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
+the -g/--gui flag is specified. This variable overrides the value
+configured in <code>merge.guitool</code>. The list below shows the valid
+built-in values. Any other value is treated as a custom diff tool
+and requires that a corresponding difftool.<guitool>.cmd variable
+is defined.</p>
<div class="dlist">
<dl>
<dt class="hdlist1"><code>araxis</code></dt>
@@ -4301,83 +4378,6 @@
</dl>
</div>
</dd>
-<dt class="hdlist1"><code>diff.indentHeuristic</code></dt>
-<dd>
-<p>Set this option to <code>false</code> to disable the default heuristics
-that shift diff hunk boundaries to make patches easier to read.</p>
-</dd>
-<dt class="hdlist1"><code>diff.algorithm</code></dt>
-<dd>
-<p>Choose a diff algorithm. The variants are as follows:</p>
-<div class="openblock">
-<div class="content">
-<div class="dlist">
-<dl>
-<dt class="hdlist1"><code>default</code></dt>
-<dt class="hdlist1"><code>myers</code></dt>
-<dd>
-<p>The basic greedy diff algorithm. Currently, this is the default.</p>
-</dd>
-<dt class="hdlist1"><code>minimal</code></dt>
-<dd>
-<p>Spend extra time to make sure the smallest possible diff is
-produced.</p>
-</dd>
-<dt class="hdlist1"><code>patience</code></dt>
-<dd>
-<p>Use "patience diff" algorithm when generating patches.</p>
-</dd>
-<dt class="hdlist1"><code>histogram</code></dt>
-<dd>
-<p>This algorithm extends the patience algorithm to "support
-low-occurrence common elements".</p>
-</dd>
-</dl>
-</div>
-</div>
-</div>
-</dd>
-<dt class="hdlist1"><code>diff.wsErrorHighlight</code></dt>
-<dd>
-<p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
-lines of the diff. Multiple values are separated by comma,
-<code>none</code> resets previous values, <code>default</code> reset the list to
-<code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. The
-whitespace errors are colored with <code>color.diff.whitespace</code>.
-The command line option <code>--ws-error-highlight=</code><em><kind></em>
-overrides this setting.</p>
-</dd>
-<dt class="hdlist1"><code>diff.colorMoved</code></dt>
-<dd>
-<p>If set to either a valid <em><mode></em> or a <code>true</code> value, moved lines
-in a diff are colored differently.
-For details of valid modes see <code>--color-moved</code> in <a href="git-diff.html">git-diff(1)</a>.
-If simply set to <code>true</code> the default color mode will be used. When
-set to <code>false</code>, moved lines are not colored.</p>
-</dd>
-<dt class="hdlist1"><code>diff.colorMovedWS</code></dt>
-<dd>
-<p>When moved lines are colored using e.g. the <code>diff.colorMoved</code> setting,
-this option controls the mode how spaces are treated.
-For details of valid modes see <code>--color-moved-ws</code> in <a href="git-diff.html">git-diff(1)</a>.</p>
-</dd>
-<dt class="hdlist1">diff.tool</dt>
-<dd>
-<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
-This variable overrides the value configured in <code>merge.tool</code>.
-The list below shows the valid built-in values.
-Any other value is treated as a custom diff tool and requires
-that a corresponding difftool.<tool>.cmd variable is defined.</p>
-</dd>
-<dt class="hdlist1">diff.guitool</dt>
-<dd>
-<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
-the -g/--gui flag is specified. This variable overrides the value
-configured in <code>merge.guitool</code>. The list below shows the valid
-built-in values. Any other value is treated as a custom diff tool
-and requires that a corresponding difftool.<guitool>.cmd variable
-is defined.</p>
-</dd>
<dt class="hdlist1">difftool.<tool>.cmd</dt>
<dd>
<p>Specify the command to invoke the specified diff tool.
diff --git a/git-diff.html b/git-diff.html
index 5e573d6..6c4cb45 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -2549,110 +2549,6 @@
<dd>
<p>Set this option to <code>true</code> to make the diff driver cache the text
conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.</p>
-<div class="dlist">
-<dl>
-<dt class="hdlist1"><code>araxis</code></dt>
-<dd>
-<p>Use Araxis Merge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>bc</code></dt>
-<dd>
-<p>Use Beyond Compare (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>bc3</code></dt>
-<dd>
-<p>Use Beyond Compare (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>bc4</code></dt>
-<dd>
-<p>Use Beyond Compare (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>codecompare</code></dt>
-<dd>
-<p>Use Code Compare (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>deltawalker</code></dt>
-<dd>
-<p>Use DeltaWalker (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>diffmerge</code></dt>
-<dd>
-<p>Use DiffMerge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>diffuse</code></dt>
-<dd>
-<p>Use Diffuse (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>ecmerge</code></dt>
-<dd>
-<p>Use ECMerge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>emerge</code></dt>
-<dd>
-<p>Use Emacs' Emerge</p>
-</dd>
-<dt class="hdlist1"><code>examdiff</code></dt>
-<dd>
-<p>Use ExamDiff Pro (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>guiffy</code></dt>
-<dd>
-<p>Use Guiffy’s Diff Tool (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>gvimdiff</code></dt>
-<dd>
-<p>Use gVim (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>kdiff3</code></dt>
-<dd>
-<p>Use KDiff3 (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>kompare</code></dt>
-<dd>
-<p>Use Kompare (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>meld</code></dt>
-<dd>
-<p>Use Meld (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>nvimdiff</code></dt>
-<dd>
-<p>Use Neovim</p>
-</dd>
-<dt class="hdlist1"><code>opendiff</code></dt>
-<dd>
-<p>Use FileMerge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>p4merge</code></dt>
-<dd>
-<p>Use HelixCore P4Merge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>smerge</code></dt>
-<dd>
-<p>Use Sublime Merge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>tkdiff</code></dt>
-<dd>
-<p>Use TkDiff (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>vimdiff</code></dt>
-<dd>
-<p>Use Vim</p>
-</dd>
-<dt class="hdlist1"><code>vscode</code></dt>
-<dd>
-<p>Use Visual Studio Code (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>winmerge</code></dt>
-<dd>
-<p>Use WinMerge (requires a graphical session)</p>
-</dd>
-<dt class="hdlist1"><code>xxdiff</code></dt>
-<dd>
-<p>Use xxdiff (requires a graphical session)</p>
-</dd>
-</dl>
-</div>
</dd>
<dt class="hdlist1"><code>diff.indentHeuristic</code></dt>
<dd>
diff --git a/git-difftool.html b/git-difftool.html
index 26cfe3d..7a620bd 100644
--- a/git-difftool.html
+++ b/git-difftool.html
@@ -618,6 +618,110 @@
built-in values. Any other value is treated as a custom diff tool
and requires that a corresponding difftool.<guitool>.cmd variable
is defined.</p>
+<div class="dlist">
+<dl>
+<dt class="hdlist1"><code>araxis</code></dt>
+<dd>
+<p>Use Araxis Merge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>bc</code></dt>
+<dd>
+<p>Use Beyond Compare (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>bc3</code></dt>
+<dd>
+<p>Use Beyond Compare (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>bc4</code></dt>
+<dd>
+<p>Use Beyond Compare (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>codecompare</code></dt>
+<dd>
+<p>Use Code Compare (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>deltawalker</code></dt>
+<dd>
+<p>Use DeltaWalker (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>diffmerge</code></dt>
+<dd>
+<p>Use DiffMerge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>diffuse</code></dt>
+<dd>
+<p>Use Diffuse (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>ecmerge</code></dt>
+<dd>
+<p>Use ECMerge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>emerge</code></dt>
+<dd>
+<p>Use Emacs' Emerge</p>
+</dd>
+<dt class="hdlist1"><code>examdiff</code></dt>
+<dd>
+<p>Use ExamDiff Pro (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>guiffy</code></dt>
+<dd>
+<p>Use Guiffy’s Diff Tool (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>gvimdiff</code></dt>
+<dd>
+<p>Use gVim (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>kdiff3</code></dt>
+<dd>
+<p>Use KDiff3 (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>kompare</code></dt>
+<dd>
+<p>Use Kompare (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>meld</code></dt>
+<dd>
+<p>Use Meld (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>nvimdiff</code></dt>
+<dd>
+<p>Use Neovim</p>
+</dd>
+<dt class="hdlist1"><code>opendiff</code></dt>
+<dd>
+<p>Use FileMerge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>p4merge</code></dt>
+<dd>
+<p>Use HelixCore P4Merge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>smerge</code></dt>
+<dd>
+<p>Use Sublime Merge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>tkdiff</code></dt>
+<dd>
+<p>Use TkDiff (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>vimdiff</code></dt>
+<dd>
+<p>Use Vim</p>
+</dd>
+<dt class="hdlist1"><code>vscode</code></dt>
+<dd>
+<p>Use Visual Studio Code (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>winmerge</code></dt>
+<dd>
+<p>Use WinMerge (requires a graphical session)</p>
+</dd>
+<dt class="hdlist1"><code>xxdiff</code></dt>
+<dd>
+<p>Use xxdiff (requires a graphical session)</p>
+</dd>
+</dl>
+</div>
</dd>
<dt class="hdlist1">difftool.<tool>.cmd</dt>
<dd>
diff --git a/gitattributes.html b/gitattributes.html
index c7bb2af..48c08d3 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1868,7 +1868,7 @@
<p>The merge driver can learn the pathname in which the merged result
will be stored via placeholder %P. The conflict labels to be used
for the common ancestor, local head and other head can be passed by
-using <em>%S</em>, <em>%X</em> and '%Y` respectively.</p>
+using %S, %X and %Y respectively.</p>
</div>
</div>
<div class="sect3">
@@ -2124,7 +2124,7 @@
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2024-07-08 15:33:45 -0700
+Last updated 2025-01-21 09:27:53 -0800
</div>
</div>
</body>
diff --git a/gitattributes.txt b/gitattributes.txt
index e615059..5d12b78 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -1166,7 +1166,7 @@
The merge driver can learn the pathname in which the merged result
will be stored via placeholder `%P`. The conflict labels to be used
for the common ancestor, local head and other head can be passed by
-using '%S', '%X' and '%Y` respectively.
+using `%S`, `%X` and `%Y` respectively.
`conflict-marker-size`
^^^^^^^^^^^^^^^^^^^^^^
