Skip to content

Commit 76cf7b2

Browse files
gitstergitster
committed
Autogenerated HTML docs for v2.51.1-500-g133d1
1 parent 0d2ffe3 commit 76cf7b2

File tree

9 files changed

+133
-100
lines changed

9 files changed

+133
-100
lines changed

‎RelNotes/2.52.0.adoc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,3 +376,7 @@ including security updates, are included in this release.
376376
(merge 1c573a3451 en/doc-merge-tree-describe-merge-base later to maint).
377377
(merge 84a6bf7965 ja/doc-markup-attached-paragraph-fix later to maint).
378378
(merge 399694384b kh/doc-patch-id-markup-fix later to maint).
379+
(merge 15b8abde07 js/mingw-includes-cleanup later to maint).
380+
(merge 3860985105 js/unreachable-workaround-for-no-symlink-head later to maint).
381+
(merge b3ac6e737d kh/doc-continued-paragraph-fix later to maint).
382+
(merge 2cebca0582 tb/cat-file-objectmode-update later to maint).

‎git-config.adoc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ OPTIONS
117117

118118
--comment <message>::
119119
Append a comment at the end of new or modified lines.
120-
121-
If _<message>_ begins with one or more whitespaces followed
122-
by "#", it is used as-is. If it begins with "#", a space is
123-
prepended before it is used. Otherwise, a string " # " (a
124-
space followed by a hash followed by a space) is prepended
125-
to it. And the resulting string is placed immediately after
126-
the value defined for the variable. The _<message>_ must
127-
not contain linefeed characters (no multi-line comments are
128-
permitted).
120+
+
121+
If _<message>_ begins with one or more whitespaces followed
122+
by "#", it is used as-is. If it begins with "#", a space is
123+
prepended before it is used. Otherwise, a string " # " (a
124+
space followed by a hash followed by a space) is prepended
125+
to it. And the resulting string is placed immediately after
126+
the value defined for the variable. The _<message>_ must
127+
not contain linefeed characters (no multi-line comments are
128+
permitted).
129129

130130
--all::
131131
With `get`, return all values for a multi-valued key.

‎git-config.html‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -607,17 +607,15 @@ <h2 id="OPTIONS">OPTIONS</h2>
607607
<dt class="hdlist1">--comment &lt;message&gt;</dt>
608608
<dd>
609609
<p>Append a comment at the end of new or modified lines.</p>
610-
<div class="literalblock">
611-
<div class="content">
612-
<pre>If _&lt;message&gt;_ begins with one or more whitespaces followed
613-
by "#", it is used as-is. If it begins with "#", a space is
610+
<div class="paragraph">
611+
<p>If <em>&lt;message&gt;</em> begins with one or more whitespaces followed
612+
by "<mark>", it is used as-is. If it begins with "</mark>", a space is
614613
prepended before it is used. Otherwise, a string " # " (a
615614
space followed by a hash followed by a space) is prepended
616615
to it. And the resulting string is placed immediately after
617-
the value defined for the variable. The _&lt;message&gt;_ must
616+
the value defined for the variable. The <em>&lt;message&gt;</em> must
618617
not contain linefeed characters (no multi-line comments are
619-
permitted).</pre>
620-
</div>
618+
permitted).</p>
621619
</div>
622620
</dd>
623621
<dt class="hdlist1">--all</dt>
@@ -3093,11 +3091,9 @@ <h3 id="_variables">Variables</h3>
30933091
limited set of supported platforms. Currently, this includes Windows
30943092
and MacOS.</p>
30953093
</div>
3096-
<div class="literalblock">
3097-
<div class="content">
3098-
<pre>Otherwise, this variable contains the pathname of the "fsmonitor"
3099-
hook command.</pre>
3100-
</div>
3094+
<div class="paragraph">
3095+
<p>Otherwise, this variable contains the pathname of the "fsmonitor"
3096+
hook command.</p>
31013097
</div>
31023098
<div class="paragraph">
31033099
<p>This hook command is used to identify all files that may have changed
@@ -8991,6 +8987,11 @@ <h3 id="_variables">Variables</h3>
89918987
<p> If this is set to true, <code>git</code> <code>stash</code> <code>apply</code> and <code>git</code> <code>stash</code> <code>pop</code> will
89928988
behave as if <code>--index</code> was supplied. Defaults to false.
89938989
See the descriptions in <a href="git-stash.html">git-stash(1)</a>.</p>
8990+
<div class="paragraph">
8991+
<p>This also affects invocations of <a href="git-stash.html">git-stash(1)</a> via <code>--autostash</code> from
8992+
commands like <a href="git-merge.html">git-merge(1)</a>, <a href="git-rebase.html">git-rebase(1)</a>, and
8993+
<a href="git-pull.html">git-pull(1)</a>.</p>
8994+
</div>
89948995
</dd>
89958996
<dt class="hdlist1"><code>stash.showIncludeUntracked</code></dt>
89968997
<dd>
@@ -10023,7 +10024,7 @@ <h2 id="_git">GIT</h2>
1002310024
</div>
1002410025
<div id="footer">
1002510026
<div id="footer-text">
10026-
Last updated 2025-08-25 14:46:08 -0700
10027+
Last updated 2025-10-20 15:09:57 -0700
1002710028
</div>
1002810029
</div>
1002910030
</body>

‎git-rev-parse.adoc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ for another option.
174174

175175
Allow oids to be input from any object format that the current
176176
repository supports.
177-
178-
Specifying "sha1" translates if necessary and returns a sha1 oid.
179-
180-
Specifying "sha256" translates if necessary and returns a sha256 oid.
181-
182-
Specifying "storage" translates if necessary and returns an oid in
183-
encoded in the storage hash algorithm.
177+
+
178+
Specifying "sha1" translates if necessary and returns a sha1 oid.
179+
+
180+
Specifying "sha256" translates if necessary and returns a sha256 oid.
181+
+
182+
Specifying "storage" translates if necessary and returns an oid in
183+
encoded in the storage hash algorithm.
184184

185185
Options for Objects
186186
~~~~~~~~~~~~~~~~~~~

‎git-rev-parse.html‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -659,21 +659,15 @@ <h3 id="_options_for_output">Options for Output</h3>
659659
<dd>
660660
<p>Allow oids to be input from any object format that the current
661661
repository supports.</p>
662-
<div class="literalblock">
663-
<div class="content">
664-
<pre>Specifying "sha1" translates if necessary and returns a sha1 oid.</pre>
665-
</div>
666-
</div>
667-
<div class="literalblock">
668-
<div class="content">
669-
<pre>Specifying "sha256" translates if necessary and returns a sha256 oid.</pre>
670-
</div>
662+
<div class="paragraph">
663+
<p>Specifying "sha1" translates if necessary and returns a sha1 oid.</p>
671664
</div>
672-
<div class="literalblock">
673-
<div class="content">
674-
<pre>Specifying "storage" translates if necessary and returns an oid in
675-
encoded in the storage hash algorithm.</pre>
665+
<div class="paragraph">
666+
<p>Specifying "sha256" translates if necessary and returns a sha256 oid.</p>
676667
</div>
668+
<div class="paragraph">
669+
<p>Specifying "storage" translates if necessary and returns an oid in
670+
encoded in the storage hash algorithm.</p>
677671
</div>
678672
</dd>
679673
</dl>
@@ -1661,7 +1655,7 @@ <h2 id="_git">GIT</h2>
16611655
</div>
16621656
<div id="footer">
16631657
<div id="footer-text">
1664-
Last updated 2025-06-20 18:10:42 -0700
1658+
Last updated 2025-10-20 15:09:57 -0700
16651659
</div>
16661660
</div>
16671661
</body>

‎git-shortlog.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ OPTIONS
4444
describe each commit. '<format>' can be any string accepted
4545
by the `--format` option of 'git log', such as '* [%h] %s'.
4646
(See the "PRETTY FORMATS" section of linkgit:git-log[1].)
47-
48-
Each pretty-printed commit will be rewrapped before it is shown.
47+
+
48+
Each pretty-printed commit will be rewrapped before it is shown.
4949

5050
--date=<format>::
5151
Show dates formatted according to the given date string. (See

‎git-shortlog.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,8 @@ <h2 id="_options">OPTIONS</h2>
502502
describe each commit. <em>&lt;format&gt;</em> can be any string accepted
503503
by the <code>--format</code> option of <em>git log</em>, such as <em>* [%h] %s</em>.
504504
(See the "PRETTY FORMATS" section of <a href="git-log.html">git-log(1)</a>.)</p>
505-
<div class="literalblock">
506-
<div class="content">
507-
<pre>Each pretty-printed commit will be rewrapped before it is shown.</pre>
508-
</div>
505+
<div class="paragraph">
506+
<p>Each pretty-printed commit will be rewrapped before it is shown.</p>
509507
</div>
510508
</dd>
511509
<dt class="hdlist1">--date=&lt;format&gt;</dt>
@@ -1565,7 +1563,7 @@ <h2 id="_git">GIT</h2>
15651563
</div>
15661564
<div id="footer">
15671565
<div id="footer-text">
1568-
Last updated 2025-06-20 18:10:42 -0700
1566+
Last updated 2025-10-20 15:09:57 -0700
15691567
</div>
15701568
</div>
15711569
</body>

‎git-sparse-checkout.adoc‎

Lines changed: 44 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -264,34 +264,50 @@ patterns in non-cone mode has a number of shortcomings:
264264
inconsistent.
265265

266266
* It has edge cases where the "right" behavior is unclear. Two examples:
267-
268-
First, two users are in a subdirectory, and the first runs
269-
git sparse-checkout set '/toplevel-dir/*.c'
270-
while the second runs
271-
git sparse-checkout set relative-dir
272-
Should those arguments be transliterated into
273-
current/subdirectory/toplevel-dir/*.c
274-
and
275-
current/subdirectory/relative-dir
276-
before inserting into the sparse-checkout file? The user who typed
277-
the first command is probably aware that arguments to set/add are
278-
supposed to be patterns in non-cone mode, and probably would not be
279-
happy with such a transliteration. However, many gitignore-style
280-
patterns are just paths, which might be what the user who typed the
281-
second command was thinking, and they'd be upset if their argument
282-
wasn't transliterated.
283-
284-
Second, what should bash-completion complete on for set/add commands
285-
for non-cone users? If it suggests paths, is it exacerbating the
286-
problem above? Also, if it suggests paths, what if the user has a
287-
file or directory that begins with either a '!' or '#' or has a '*',
288-
'\', '?', '[', or ']' in its name? And if it suggests paths, will
289-
it complete "/pro" to "/proc" (in the root filesystem) rather than to
290-
"/progress.txt" in the current directory? (Note that users are
291-
likely to want to start paths with a leading '/' in non-cone mode,
292-
for the same reason that .gitignore files often have one.)
293-
Completing on files or directories might give nasty surprises in
294-
all these cases.
267+
+
268+
First, two users are in a subdirectory, and the first runs
269+
+
270+
----
271+
git sparse-checkout set '/toplevel-dir/*.c'
272+
----
273+
+
274+
while the second runs
275+
+
276+
----
277+
git sparse-checkout set relative-dir
278+
----
279+
+
280+
Should those arguments be transliterated into
281+
+
282+
----
283+
current/subdirectory/toplevel-dir/*.c
284+
----
285+
+
286+
and
287+
+
288+
----
289+
current/subdirectory/relative-dir
290+
----
291+
+
292+
before inserting into the sparse-checkout file? The user who typed
293+
the first command is probably aware that arguments to set/add are
294+
supposed to be patterns in non-cone mode, and probably would not be
295+
happy with such a transliteration. However, many gitignore-style
296+
patterns are just paths, which might be what the user who typed the
297+
second command was thinking, and they'd be upset if their argument
298+
wasn't transliterated.
299+
+
300+
Second, what should bash-completion complete on for set/add commands
301+
for non-cone users? If it suggests paths, is it exacerbating the
302+
problem above? Also, if it suggests paths, what if the user has a
303+
file or directory that begins with either a '!' or '#' or has a '*',
304+
'\', '?', '[', or ']' in its name? And if it suggests paths, will
305+
it complete "/pro" to "/proc" (in the root filesystem) rather than to
306+
"/progress.txt" in the current directory? (Note that users are
307+
likely to want to start paths with a leading '/' in non-cone mode,
308+
for the same reason that .gitignore files often have one.)
309+
Completing on files or directories might give nasty surprises in
310+
all these cases.
295311

296312
* The excessive flexibility made other extensions essentially
297313
impractical. `--sparse-index` is likely impossible in non-cone

‎git-sparse-checkout.html‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -760,39 +760,59 @@ <h2 id="_internalsnon_cone_problems">INTERNALS&#8201;&#8212;&#8201;NON-CONE PROB
760760
</li>
761761
<li>
762762
<p>It has edge cases where the "right" behavior is unclear. Two examples:</p>
763-
<div class="literalblock">
763+
<div class="paragraph">
764+
<p>First, two users are in a subdirectory, and the first runs</p>
765+
</div>
766+
<div class="listingblock">
767+
<div class="content">
768+
<pre>git sparse-checkout set '/toplevel-dir/*.c'</pre>
769+
</div>
770+
</div>
771+
<div class="paragraph">
772+
<p>while the second runs</p>
773+
</div>
774+
<div class="listingblock">
775+
<div class="content">
776+
<pre>git sparse-checkout set relative-dir</pre>
777+
</div>
778+
</div>
779+
<div class="paragraph">
780+
<p>Should those arguments be transliterated into</p>
781+
</div>
782+
<div class="listingblock">
783+
<div class="content">
784+
<pre>current/subdirectory/toplevel-dir/*.c</pre>
785+
</div>
786+
</div>
787+
<div class="paragraph">
788+
<p>and</p>
789+
</div>
790+
<div class="listingblock">
764791
<div class="content">
765-
<pre>First, two users are in a subdirectory, and the first runs
766-
git sparse-checkout set '/toplevel-dir/*.c'
767-
while the second runs
768-
git sparse-checkout set relative-dir
769-
Should those arguments be transliterated into
770-
current/subdirectory/toplevel-dir/*.c
771-
and
772-
current/subdirectory/relative-dir
773-
before inserting into the sparse-checkout file? The user who typed
792+
<pre>current/subdirectory/relative-dir</pre>
793+
</div>
794+
</div>
795+
<div class="paragraph">
796+
<p>before inserting into the sparse-checkout file? The user who typed
774797
the first command is probably aware that arguments to set/add are
775798
supposed to be patterns in non-cone mode, and probably would not be
776799
happy with such a transliteration. However, many gitignore-style
777800
patterns are just paths, which might be what the user who typed the
778-
second command was thinking, and they'd be upset if their argument
779-
wasn't transliterated.</pre>
801+
second command was thinking, and they&#8217;d be upset if their argument
802+
wasn&#8217;t transliterated.</p>
780803
</div>
781-
</div>
782-
<div class="literalblock">
783-
<div class="content">
784-
<pre>Second, what should bash-completion complete on for set/add commands
804+
<div class="paragraph">
805+
<p>Second, what should bash-completion complete on for set/add commands
785806
for non-cone users? If it suggests paths, is it exacerbating the
786807
problem above? Also, if it suggests paths, what if the user has a
787-
file or directory that begins with either a '!' or '#' or has a '*',
788-
'\', '?', '[', or ']' in its name? And if it suggests paths, will
808+
file or directory that begins with either a <em>!</em> or <em>#</em> or has a <em>*</em>,
809+
<em>\</em>, <em>?</em>, <em>[</em>, or <em>]</em> in its name? And if it suggests paths, will
789810
it complete "/pro" to "/proc" (in the root filesystem) rather than to
790811
"/progress.txt" in the current directory? (Note that users are
791-
likely to want to start paths with a leading '/' in non-cone mode,
812+
likely to want to start paths with a leading <em>/</em> in non-cone mode,
792813
for the same reason that .gitignore files often have one.)
793814
Completing on files or directories might give nasty surprises in
794-
all these cases.</pre>
795-
</div>
815+
all these cases.</p>
796816
</div>
797817
</li>
798818
<li>
@@ -1045,7 +1065,7 @@ <h2 id="_git">GIT</h2>
10451065
</div>
10461066
<div id="footer">
10471067
<div id="footer-text">
1048-
Last updated 2025-06-20 18:10:42 -0700
1068+
Last updated 2025-10-20 15:09:57 -0700
10491069
</div>
10501070
</div>
10511071
</body>

0 commit comments

Comments
 (0)