Skip to content

Commit

Permalink
Autogenerated HTML docs for v2.48.1-76-g4e746
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitster
gitster committed Jan 21, 2025
1 parent 2a69cf2 commit e480a99
Show file tree
Hide file tree
Showing 6 changed files with 206 additions and 184 deletions.
22 changes: 22 additions & 0 deletions RelNotes/2.49.0.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Git v2.49 Release Notes
UI, Workflows & Features
------------------------

* Completion script updates for zsh


Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
Expand All @@ -12,6 +14,13 @@ Performance, Internal Implementation, Development Support etc.

* 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
-----------------
Expand All @@ -30,4 +39,17 @@ Fixes since v2.48
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).
154 changes: 77 additions & 77 deletions git-config.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4196,6 +4196,83 @@ <h3 id="_variables">Variables</h3>
<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>&lt;kind&gt;</em>
overrides this setting.</p>
</dd>
<dt class="hdlist1"><code>diff.colorMoved</code></dt>
<dd>
<p>If set to either a valid <em>&lt;mode&gt;</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.&lt;tool&gt;.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.&lt;guitool&gt;.cmd variable
is defined.</p>
<div class="dlist">
<dl>
<dt class="hdlist1"><code>araxis</code></dt>
Expand Down Expand Up @@ -4301,83 +4378,6 @@ <h3 id="_variables">Variables</h3>
</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>&lt;kind&gt;</em>
overrides this setting.</p>
</dd>
<dt class="hdlist1"><code>diff.colorMoved</code></dt>
<dd>
<p>If set to either a valid <em>&lt;mode&gt;</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.&lt;tool&gt;.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.&lt;guitool&gt;.cmd variable
is defined.</p>
</dd>
<dt class="hdlist1">difftool.&lt;tool&gt;.cmd</dt>
<dd>
<p>Specify the command to invoke the specified diff tool.
Expand Down
104 changes: 0 additions & 104 deletions git-diff.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2549,110 +2549,6 @@ <h2 id="_configuration">CONFIGURATION</h2>
<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&#8217;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>
Expand Down
Loading

0 comments on commit e480a99

Please sign in to comment.