Skip to content

Commit e480a99

Browse files
gitstergitster
committed
Autogenerated HTML docs for v2.48.1-76-g4e746
1 parent 2a69cf2 commit e480a99

File tree

6 files changed

+206
-184
lines changed

6 files changed

+206
-184
lines changed

‎RelNotes/2.49.0.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Git v2.49 Release Notes
44
UI, Workflows & Features
55
------------------------
66

7+
* Completion script updates for zsh
8+
79

810
Performance, Internal Implementation, Development Support etc.
911
--------------------------------------------------------------
@@ -12,6 +14,13 @@ Performance, Internal Implementation, Development Support etc.
1214

1315
* meson-based build now supports the unsafe-sha1 build knob.
1416

17+
* The code to check LSan results has been simplified and made more
18+
robust.
19+
(merge 164a2516eb jk/lsan-race-ignore-false-positive later to maint).
20+
21+
* More code paths have a repository passed through the callchain,
22+
instead of assuming the primary the_repository object.
23+
1524

1625
Fixes since v2.48
1726
-----------------
@@ -30,4 +39,17 @@ Fixes since v2.48
3039
to.
3140
(merge d7fcbe2c56 ps/object-collision-check later to maint).
3241

42+
* The code to compute "unique" name used git_rand() which can fail or
43+
get stuck; the callsite does not require cryptographic security.
44+
Introduce the "insecure" mode and use it appropriately.
45+
(merge 0b4f8afef6 ps/reftable-get-random-fix later to maint).
46+
47+
* A misconfigured "fsck.skiplist" configuration variable was not
48+
diagnosed as an error, which has been corrected.
49+
(merge ca7158076f jt/fsck-skiplist-parse-fix later to maint).
50+
3351
* Other code cleanup, docfix, build fix, etc.
52+
(merge ddb5287894 jk/t7407-use-test-grep later to maint).
53+
(merge 21e1b44865 aj/difftool-config-doc-fix later to maint).
54+
(merge 6a63995335 mh/gitattr-doc-markup-fix later to maint).
55+
(merge 43850dcf9c sk/unit-test-hash later to maint).

‎git-config.html

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4196,6 +4196,83 @@ <h3 id="_variables">Variables</h3>
41964196
<dd>
41974197
<p>Set this option to <code>true</code> to make the diff driver cache the text
41984198
conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.</p>
4199+
</dd>
4200+
<dt class="hdlist1"><code>diff.indentHeuristic</code></dt>
4201+
<dd>
4202+
<p>Set this option to <code>false</code> to disable the default heuristics
4203+
that shift diff hunk boundaries to make patches easier to read.</p>
4204+
</dd>
4205+
<dt class="hdlist1"><code>diff.algorithm</code></dt>
4206+
<dd>
4207+
<p>Choose a diff algorithm. The variants are as follows:</p>
4208+
<div class="openblock">
4209+
<div class="content">
4210+
<div class="dlist">
4211+
<dl>
4212+
<dt class="hdlist1"><code>default</code></dt>
4213+
<dt class="hdlist1"><code>myers</code></dt>
4214+
<dd>
4215+
<p>The basic greedy diff algorithm. Currently, this is the default.</p>
4216+
</dd>
4217+
<dt class="hdlist1"><code>minimal</code></dt>
4218+
<dd>
4219+
<p>Spend extra time to make sure the smallest possible diff is
4220+
produced.</p>
4221+
</dd>
4222+
<dt class="hdlist1"><code>patience</code></dt>
4223+
<dd>
4224+
<p>Use "patience diff" algorithm when generating patches.</p>
4225+
</dd>
4226+
<dt class="hdlist1"><code>histogram</code></dt>
4227+
<dd>
4228+
<p>This algorithm extends the patience algorithm to "support
4229+
low-occurrence common elements".</p>
4230+
</dd>
4231+
</dl>
4232+
</div>
4233+
</div>
4234+
</div>
4235+
</dd>
4236+
<dt class="hdlist1"><code>diff.wsErrorHighlight</code></dt>
4237+
<dd>
4238+
<p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
4239+
lines of the diff. Multiple values are separated by comma,
4240+
<code>none</code> resets previous values, <code>default</code> reset the list to
4241+
<code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. The
4242+
whitespace errors are colored with <code>color.diff.whitespace</code>.
4243+
The command line option <code>--ws-error-highlight=</code><em>&lt;kind&gt;</em>
4244+
overrides this setting.</p>
4245+
</dd>
4246+
<dt class="hdlist1"><code>diff.colorMoved</code></dt>
4247+
<dd>
4248+
<p>If set to either a valid <em>&lt;mode&gt;</em> or a <code>true</code> value, moved lines
4249+
in a diff are colored differently.
4250+
For details of valid modes see <code>--color-moved</code> in <a href="git-diff.html">git-diff(1)</a>.
4251+
If simply set to <code>true</code> the default color mode will be used. When
4252+
set to <code>false</code>, moved lines are not colored.</p>
4253+
</dd>
4254+
<dt class="hdlist1"><code>diff.colorMovedWS</code></dt>
4255+
<dd>
4256+
<p>When moved lines are colored using e.g. the <code>diff.colorMoved</code> setting,
4257+
this option controls the mode how spaces are treated.
4258+
For details of valid modes see <code>--color-moved-ws</code> in <a href="git-diff.html">git-diff(1)</a>.</p>
4259+
</dd>
4260+
<dt class="hdlist1">diff.tool</dt>
4261+
<dd>
4262+
<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
4263+
This variable overrides the value configured in <code>merge.tool</code>.
4264+
The list below shows the valid built-in values.
4265+
Any other value is treated as a custom diff tool and requires
4266+
that a corresponding difftool.&lt;tool&gt;.cmd variable is defined.</p>
4267+
</dd>
4268+
<dt class="hdlist1">diff.guitool</dt>
4269+
<dd>
4270+
<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
4271+
the -g/--gui flag is specified. This variable overrides the value
4272+
configured in <code>merge.guitool</code>. The list below shows the valid
4273+
built-in values. Any other value is treated as a custom diff tool
4274+
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
4275+
is defined.</p>
41994276
<div class="dlist">
42004277
<dl>
42014278
<dt class="hdlist1"><code>araxis</code></dt>
@@ -4301,83 +4378,6 @@ <h3 id="_variables">Variables</h3>
43014378
</dl>
43024379
</div>
43034380
</dd>
4304-
<dt class="hdlist1"><code>diff.indentHeuristic</code></dt>
4305-
<dd>
4306-
<p>Set this option to <code>false</code> to disable the default heuristics
4307-
that shift diff hunk boundaries to make patches easier to read.</p>
4308-
</dd>
4309-
<dt class="hdlist1"><code>diff.algorithm</code></dt>
4310-
<dd>
4311-
<p>Choose a diff algorithm. The variants are as follows:</p>
4312-
<div class="openblock">
4313-
<div class="content">
4314-
<div class="dlist">
4315-
<dl>
4316-
<dt class="hdlist1"><code>default</code></dt>
4317-
<dt class="hdlist1"><code>myers</code></dt>
4318-
<dd>
4319-
<p>The basic greedy diff algorithm. Currently, this is the default.</p>
4320-
</dd>
4321-
<dt class="hdlist1"><code>minimal</code></dt>
4322-
<dd>
4323-
<p>Spend extra time to make sure the smallest possible diff is
4324-
produced.</p>
4325-
</dd>
4326-
<dt class="hdlist1"><code>patience</code></dt>
4327-
<dd>
4328-
<p>Use "patience diff" algorithm when generating patches.</p>
4329-
</dd>
4330-
<dt class="hdlist1"><code>histogram</code></dt>
4331-
<dd>
4332-
<p>This algorithm extends the patience algorithm to "support
4333-
low-occurrence common elements".</p>
4334-
</dd>
4335-
</dl>
4336-
</div>
4337-
</div>
4338-
</div>
4339-
</dd>
4340-
<dt class="hdlist1"><code>diff.wsErrorHighlight</code></dt>
4341-
<dd>
4342-
<p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
4343-
lines of the diff. Multiple values are separated by comma,
4344-
<code>none</code> resets previous values, <code>default</code> reset the list to
4345-
<code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. The
4346-
whitespace errors are colored with <code>color.diff.whitespace</code>.
4347-
The command line option <code>--ws-error-highlight=</code><em>&lt;kind&gt;</em>
4348-
overrides this setting.</p>
4349-
</dd>
4350-
<dt class="hdlist1"><code>diff.colorMoved</code></dt>
4351-
<dd>
4352-
<p>If set to either a valid <em>&lt;mode&gt;</em> or a <code>true</code> value, moved lines
4353-
in a diff are colored differently.
4354-
For details of valid modes see <code>--color-moved</code> in <a href="git-diff.html">git-diff(1)</a>.
4355-
If simply set to <code>true</code> the default color mode will be used. When
4356-
set to <code>false</code>, moved lines are not colored.</p>
4357-
</dd>
4358-
<dt class="hdlist1"><code>diff.colorMovedWS</code></dt>
4359-
<dd>
4360-
<p>When moved lines are colored using e.g. the <code>diff.colorMoved</code> setting,
4361-
this option controls the mode how spaces are treated.
4362-
For details of valid modes see <code>--color-moved-ws</code> in <a href="git-diff.html">git-diff(1)</a>.</p>
4363-
</dd>
4364-
<dt class="hdlist1">diff.tool</dt>
4365-
<dd>
4366-
<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
4367-
This variable overrides the value configured in <code>merge.tool</code>.
4368-
The list below shows the valid built-in values.
4369-
Any other value is treated as a custom diff tool and requires
4370-
that a corresponding difftool.&lt;tool&gt;.cmd variable is defined.</p>
4371-
</dd>
4372-
<dt class="hdlist1">diff.guitool</dt>
4373-
<dd>
4374-
<p>Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
4375-
the -g/--gui flag is specified. This variable overrides the value
4376-
configured in <code>merge.guitool</code>. The list below shows the valid
4377-
built-in values. Any other value is treated as a custom diff tool
4378-
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
4379-
is defined.</p>
4380-
</dd>
43814381
<dt class="hdlist1">difftool.&lt;tool&gt;.cmd</dt>
43824382
<dd>
43834383
<p>Specify the command to invoke the specified diff tool.

‎git-diff.html

Lines changed: 0 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -2549,110 +2549,6 @@ <h2 id="_configuration">CONFIGURATION</h2>
25492549
<dd>
25502550
<p>Set this option to <code>true</code> to make the diff driver cache the text
25512551
conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.</p>
2552-
<div class="dlist">
2553-
<dl>
2554-
<dt class="hdlist1"><code>araxis</code></dt>
2555-
<dd>
2556-
<p>Use Araxis Merge (requires a graphical session)</p>
2557-
</dd>
2558-
<dt class="hdlist1"><code>bc</code></dt>
2559-
<dd>
2560-
<p>Use Beyond Compare (requires a graphical session)</p>
2561-
</dd>
2562-
<dt class="hdlist1"><code>bc3</code></dt>
2563-
<dd>
2564-
<p>Use Beyond Compare (requires a graphical session)</p>
2565-
</dd>
2566-
<dt class="hdlist1"><code>bc4</code></dt>
2567-
<dd>
2568-
<p>Use Beyond Compare (requires a graphical session)</p>
2569-
</dd>
2570-
<dt class="hdlist1"><code>codecompare</code></dt>
2571-
<dd>
2572-
<p>Use Code Compare (requires a graphical session)</p>
2573-
</dd>
2574-
<dt class="hdlist1"><code>deltawalker</code></dt>
2575-
<dd>
2576-
<p>Use DeltaWalker (requires a graphical session)</p>
2577-
</dd>
2578-
<dt class="hdlist1"><code>diffmerge</code></dt>
2579-
<dd>
2580-
<p>Use DiffMerge (requires a graphical session)</p>
2581-
</dd>
2582-
<dt class="hdlist1"><code>diffuse</code></dt>
2583-
<dd>
2584-
<p>Use Diffuse (requires a graphical session)</p>
2585-
</dd>
2586-
<dt class="hdlist1"><code>ecmerge</code></dt>
2587-
<dd>
2588-
<p>Use ECMerge (requires a graphical session)</p>
2589-
</dd>
2590-
<dt class="hdlist1"><code>emerge</code></dt>
2591-
<dd>
2592-
<p>Use Emacs' Emerge</p>
2593-
</dd>
2594-
<dt class="hdlist1"><code>examdiff</code></dt>
2595-
<dd>
2596-
<p>Use ExamDiff Pro (requires a graphical session)</p>
2597-
</dd>
2598-
<dt class="hdlist1"><code>guiffy</code></dt>
2599-
<dd>
2600-
<p>Use Guiffy&#8217;s Diff Tool (requires a graphical session)</p>
2601-
</dd>
2602-
<dt class="hdlist1"><code>gvimdiff</code></dt>
2603-
<dd>
2604-
<p>Use gVim (requires a graphical session)</p>
2605-
</dd>
2606-
<dt class="hdlist1"><code>kdiff3</code></dt>
2607-
<dd>
2608-
<p>Use KDiff3 (requires a graphical session)</p>
2609-
</dd>
2610-
<dt class="hdlist1"><code>kompare</code></dt>
2611-
<dd>
2612-
<p>Use Kompare (requires a graphical session)</p>
2613-
</dd>
2614-
<dt class="hdlist1"><code>meld</code></dt>
2615-
<dd>
2616-
<p>Use Meld (requires a graphical session)</p>
2617-
</dd>
2618-
<dt class="hdlist1"><code>nvimdiff</code></dt>
2619-
<dd>
2620-
<p>Use Neovim</p>
2621-
</dd>
2622-
<dt class="hdlist1"><code>opendiff</code></dt>
2623-
<dd>
2624-
<p>Use FileMerge (requires a graphical session)</p>
2625-
</dd>
2626-
<dt class="hdlist1"><code>p4merge</code></dt>
2627-
<dd>
2628-
<p>Use HelixCore P4Merge (requires a graphical session)</p>
2629-
</dd>
2630-
<dt class="hdlist1"><code>smerge</code></dt>
2631-
<dd>
2632-
<p>Use Sublime Merge (requires a graphical session)</p>
2633-
</dd>
2634-
<dt class="hdlist1"><code>tkdiff</code></dt>
2635-
<dd>
2636-
<p>Use TkDiff (requires a graphical session)</p>
2637-
</dd>
2638-
<dt class="hdlist1"><code>vimdiff</code></dt>
2639-
<dd>
2640-
<p>Use Vim</p>
2641-
</dd>
2642-
<dt class="hdlist1"><code>vscode</code></dt>
2643-
<dd>
2644-
<p>Use Visual Studio Code (requires a graphical session)</p>
2645-
</dd>
2646-
<dt class="hdlist1"><code>winmerge</code></dt>
2647-
<dd>
2648-
<p>Use WinMerge (requires a graphical session)</p>
2649-
</dd>
2650-
<dt class="hdlist1"><code>xxdiff</code></dt>
2651-
<dd>
2652-
<p>Use xxdiff (requires a graphical session)</p>
2653-
</dd>
2654-
</dl>
2655-
</div>
26562552
</dd>
26572553
<dt class="hdlist1"><code>diff.indentHeuristic</code></dt>
26582554
<dd>

0 commit comments

Comments
 (0)