Skip to content

Commit 2b1164d

Browse files
gitstergitster
committed
Autogenerated HTML docs for v2.42.0-296-g493f46
1 parent acfb98d commit 2b1164d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+204
-130
lines changed

‎MyFirstContribution.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>My First Contribution to the Git Project</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎MyFirstObjectWalk.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>My First Object Walk</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎RelNotes/2.43.0.txt

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,21 @@ UI, Workflows & Features
5757
* The command-line complation support (in contrib/) learned to
5858
complete "git commit --trailer=" for possible trailer keys.
5959

60-
6160
* "git update-index" learns "--show-index-version" to inspect
6261
the index format version used by the on-disk index file.
6362

63+
* "git diff" learned diff.statNameWidth configuration variable, to
64+
give the default width for the name part in the "--stat" output.
65+
66+
* "git range-diff --notes=foo" compared "log --notes=foo --notes" of
67+
the two ranges, instead of using just the specified notes tree.
68+
69+
* The command line completion script (in contrib/) can be told to
70+
complete aliases by including ": git <cmd> ;" in the alias to tell
71+
it that the alias should be completed similar to how "git <cmd>" is
72+
completed. The parsing code for the alias as been loosened to
73+
allow ';' without an extra space before it.
74+
6475

6576
Performance, Internal Implementation, Development Support etc.
6677

@@ -74,12 +85,12 @@ Performance, Internal Implementation, Development Support etc.
7485
* Tests that are known to pass with LSan are now marked as such.
7586
(merge 5fafe8c95f tb/mark-more-tests-as-leak-free later to maint).
7687

77-
* Flakey "git p4" tests, as well as "git svn" tests, are now skipped
88+
* Flaky "git p4" tests, as well as "git svn" tests, are now skipped
7889
in the (rather expensive) sanitizer CI job.
7990
(merge 6ba913629f js/ci-san-skip-p4-and-svn-tests later to maint).
8091

8192
* Tests with LSan from time to time seem to emit harmless message
82-
that makes our tests unnecessarily flakey; we work it around by
93+
that makes our tests unnecessarily flaky; we work it around by
8394
filtering the uninteresting output.
8495
(merge 370ef7e40d jk/test-lsan-denoise-output later to maint).
8596

@@ -134,7 +145,7 @@ Fixes since v2.42
134145
pathnames recorded in tree objects.
135146
(merge 4d5693ba05 jk/tree-name-and-depth-limit later to maint).
136147

137-
* Various fixes to the behaviour of "rebase -i" when the command got
148+
* Various fixes to the behavior of "rebase -i" when the command got
138149
interrupted by conflicting changes.
139150
(merge 203573b024 pw/rebase-i-after-failure later to maint).
140151

@@ -155,7 +166,7 @@ Fixes since v2.42
155166
which has been corrected.
156167
(merge 48944f214c pw/diff-no-index-from-named-pipes later to maint).
157168

158-
* Update "git maintainance" timers' implementation based on systemd
169+
* Update "git maintenance" timers' implementation based on systemd
159170
timers to work with WSL.
160171
(merge 5e8515e8e8 js/systemd-timers-wsl-fix later to maint).
161172

@@ -178,6 +189,10 @@ Fixes since v2.42
178189
address did not give correct information, which has been corrected.
179190
(merge 12288cc44e tb/send-email-extract-valid-address-error-message-fix later to maint).
180191

192+
* UBSan options were not propagated through the test framework to git
193+
run via the httpd, unlike ASan options, which has been corrected.
194+
(merge 252d693797 jk/test-pass-ubsan-options-to-http-test later to maint).
195+
181196
* Other code cleanup, docfix, build fix, etc.
182197
(merge fd3ba590d8 ws/git-push-doc-grammofix later to maint).
183198
(merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint).
@@ -196,3 +211,5 @@ Fixes since v2.42
196211
(merge 8aae489756 ob/t3404-typofix later to maint).
197212
(merge 58be11432e eg/config-type-path-docfix later to maint).
198213
(merge 563f339d98 ch/clean-docfix later to maint).
214+
(merge 4fbe83fcd9 hy/doc-show-is-like-log-not-diff-tree later to maint).
215+
(merge 43abaaf008 ob/am-msgfix later to maint).

‎ReviewingGuidelines.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>Reviewing Patches in the Git Project</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎SubmittingPatches.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>Submitting Patches</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎ToolsForGit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>Tools for developing Git</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎diff-options.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,15 @@ have to use `--diff-algorithm=default` option.
204204
part. Maximum width defaults to terminal width, or 80 columns
205205
if not connected to a terminal, and can be overridden by
206206
`<width>`. The width of the filename part can be limited by
207-
giving another width `<name-width>` after a comma. The width
208-
of the graph part can be limited by using
209-
`--stat-graph-width=<width>` (affects all commands generating
210-
a stat graph) or by setting `diff.statGraphWidth=<width>`
211-
(does not affect `git format-patch`).
212-
By giving a third parameter `<count>`, you can limit the
213-
output to the first `<count>` lines, followed by `...` if
214-
there are more.
207+
giving another width `<name-width>` after a comma or by setting
208+
`diff.statNameWidth=<width>`. The width of the graph part can be
209+
limited by using `--stat-graph-width=<width>` or by setting
210+
`diff.statGraphWidth=<width>`. Using `--stat` or
211+
`--stat-graph-width` affects all commands generating a stat graph,
212+
while setting `diff.statNameWidth` or `diff.statGraphWidth`
213+
does not affect `git format-patch`.
214+
By giving a third parameter `<count>`, you can limit the output to
215+
the first `<count>` lines, followed by `...` if there are more.
215216
+
216217
These parameters can also be set individually with `--stat-width=<width>`,
217218
`--stat-name-width=<name-width>` and `--stat-count=<count>`.

‎everyday.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>Everyday Git With 20 Commands Or So</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div id="preamble">

‎git-config.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4738,6 +4738,15 @@ <h3 id="_variables">Variables</h3>
47384738
<code>files,10,cumulative</code>.</p></div>
47394739
</dd>
47404740
<dt class="hdlist1">
4741+
diff.statNameWidth
4742+
</dt>
4743+
<dd>
4744+
<p>
4745+
Limit the width of the filename part in --stat output. If set, applies
4746+
to all commands generating --stat output except format-patch.
4747+
</p>
4748+
</dd>
4749+
<dt class="hdlist1">
47414750
diff.statGraphWidth
47424751
</dt>
47434752
<dd>

‎git-diff-files.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -964,14 +964,15 @@ <h2 id="_options">OPTIONS</h2>
964964
part. Maximum width defaults to terminal width, or 80 columns
965965
if not connected to a terminal, and can be overridden by
966966
<code>&lt;width&gt;</code>. The width of the filename part can be limited by
967-
giving another width <code>&lt;name-width&gt;</code> after a comma. The width
968-
of the graph part can be limited by using
969-
<code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
970-
a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
971-
(does not affect <code>git format-patch</code>).
972-
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
973-
output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
974-
there are more.
967+
giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
968+
<code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
969+
limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
970+
<code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
971+
<code>--stat-graph-width</code> affects all commands generating a stat graph,
972+
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
973+
does not affect <code>git format-patch</code>.
974+
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
975+
the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.
975976
</p>
976977
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
977978
<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>

‎git-diff-index.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -965,14 +965,15 @@ <h2 id="_options">OPTIONS</h2>
965965
part. Maximum width defaults to terminal width, or 80 columns
966966
if not connected to a terminal, and can be overridden by
967967
<code>&lt;width&gt;</code>. The width of the filename part can be limited by
968-
giving another width <code>&lt;name-width&gt;</code> after a comma. The width
969-
of the graph part can be limited by using
970-
<code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
971-
a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
972-
(does not affect <code>git format-patch</code>).
973-
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
974-
output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
975-
there are more.
968+
giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
969+
<code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
970+
limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
971+
<code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
972+
<code>--stat-graph-width</code> affects all commands generating a stat graph,
973+
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
974+
does not affect <code>git format-patch</code>.
975+
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
976+
the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.
976977
</p>
977978
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
978979
<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>

‎git-diff-tree.html

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -966,14 +966,15 @@ <h2 id="_options">OPTIONS</h2>
966966
part. Maximum width defaults to terminal width, or 80 columns
967967
if not connected to a terminal, and can be overridden by
968968
<code>&lt;width&gt;</code>. The width of the filename part can be limited by
969-
giving another width <code>&lt;name-width&gt;</code> after a comma. The width
970-
of the graph part can be limited by using
971-
<code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
972-
a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
973-
(does not affect <code>git format-patch</code>).
974-
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
975-
output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
976-
there are more.
969+
giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
970+
<code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
971+
limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
972+
<code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
973+
<code>--stat-graph-width</code> affects all commands generating a stat graph,
974+
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
975+
does not affect <code>git format-patch</code>.
976+
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
977+
the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.
977978
</p>
978979
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
979980
<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>
@@ -2286,6 +2287,15 @@ <h2 id="_options">OPTIONS</h2>
22862287
</p>
22872288
</dd>
22882289
<dt class="hdlist1">
2290+
--show-notes-by-default
2291+
</dt>
2292+
<dd>
2293+
<p>
2294+
Show the default notes unless options for displaying specific
2295+
notes are given.
2296+
</p>
2297+
</dd>
2298+
<dt class="hdlist1">
22892299
--show-notes[=&lt;ref&gt;]
22902300
</dt>
22912301
<dt class="hdlist1">

‎git-diff.html

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,14 +1101,15 @@ <h2 id="_options">OPTIONS</h2>
11011101
part. Maximum width defaults to terminal width, or 80 columns
11021102
if not connected to a terminal, and can be overridden by
11031103
<code>&lt;width&gt;</code>. The width of the filename part can be limited by
1104-
giving another width <code>&lt;name-width&gt;</code> after a comma. The width
1105-
of the graph part can be limited by using
1106-
<code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
1107-
a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
1108-
(does not affect <code>git format-patch</code>).
1109-
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
1110-
output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
1111-
there are more.
1104+
giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
1105+
<code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
1106+
limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
1107+
<code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
1108+
<code>--stat-graph-width</code> affects all commands generating a stat graph,
1109+
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
1110+
does not affect <code>git format-patch</code>.
1111+
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
1112+
the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.
11121113
</p>
11131114
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
11141115
<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>
@@ -3100,6 +3101,15 @@ <h2 id="_configuration">CONFIGURATION</h2>
31003101
<code>files,10,cumulative</code>.</p></div>
31013102
</dd>
31023103
<dt class="hdlist1">
3104+
diff.statNameWidth
3105+
</dt>
3106+
<dd>
3107+
<p>
3108+
Limit the width of the filename part in --stat output. If set, applies
3109+
to all commands generating --stat output except format-patch.
3110+
</p>
3111+
</dd>
3112+
<dt class="hdlist1">
31033113
diff.statGraphWidth
31043114
</dt>
31053115
<dd>

‎git-format-patch.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,14 +1022,15 @@ <h2 id="_options">OPTIONS</h2>
10221022
part. Maximum width defaults to terminal width, or 80 columns
10231023
if not connected to a terminal, and can be overridden by
10241024
<code>&lt;width&gt;</code>. The width of the filename part can be limited by
1025-
giving another width <code>&lt;name-width&gt;</code> after a comma. The width
1026-
of the graph part can be limited by using
1027-
<code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
1028-
a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
1029-
(does not affect <code>git format-patch</code>).
1030-
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
1031-
output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
1032-
there are more.
1025+
giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
1026+
<code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
1027+
limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
1028+
<code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
1029+
<code>--stat-graph-width</code> affects all commands generating a stat graph,
1030+
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
1031+
does not affect <code>git format-patch</code>.
1032+
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
1033+
the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.
10331034
</p>
10341035
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
10351036
<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>

‎git-log.html

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2286,6 +2286,15 @@ <h3 id="_commit_formatting">Commit Formatting</h3>
22862286
</p>
22872287
</dd>
22882288
<dt class="hdlist1">
2289+
--show-notes-by-default
2290+
</dt>
2291+
<dd>
2292+
<p>
2293+
Show the default notes unless options for displaying specific
2294+
notes are given.
2295+
</p>
2296+
</dd>
2297+
<dt class="hdlist1">
22892298
--show-notes[=&lt;ref&gt;]
22902299
</dt>
22912300
<dt class="hdlist1">
@@ -3872,14 +3881,15 @@ <h2 id="_diff_formatting">DIFF FORMATTING</h2>
38723881
part. Maximum width defaults to terminal width, or 80 columns
38733882
if not connected to a terminal, and can be overridden by
38743883
<code>&lt;width&gt;</code>. The width of the filename part can be limited by
3875-
giving another width <code>&lt;name-width&gt;</code> after a comma. The width
3876-
of the graph part can be limited by using
3877-
<code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
3878-
a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
3879-
(does not affect <code>git format-patch</code>).
3880-
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
3881-
output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
3882-
there are more.
3884+
giving another width <code>&lt;name-width&gt;</code> after a comma or by setting
3885+
<code>diff.statNameWidth=&lt;width&gt;</code>. The width of the graph part can be
3886+
limited by using <code>--stat-graph-width=&lt;width&gt;</code> or by setting
3887+
<code>diff.statGraphWidth=&lt;width&gt;</code>. Using <code>--stat</code> or
3888+
<code>--stat-graph-width</code> affects all commands generating a stat graph,
3889+
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
3890+
does not affect <code>git format-patch</code>.
3891+
By giving a third parameter <code>&lt;count&gt;</code>, you can limit the output to
3892+
the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if there are more.
38833893
</p>
38843894
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
38853895
<code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>

‎git-remote-helpers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>git-remote-helpers</h1>
738-
<span id="revdate">2023-09-22</span>
738+
<span id="revdate">2023-09-29</span>
739739
</div>
740740
<div id="content">
741741
<div id="preamble">

0 commit comments

Comments
 (0)