Skip to content

Commit 991c664

Browse files
committed
Autogenerated HTML docs for v2.49.0-281-g77d6e
1 parent c9425ef commit 991c664

File tree

6 files changed

+114
-24
lines changed

6 files changed

+114
-24
lines changed

RelNotes/2.50.0.adoc

+29
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@ UI, Workflows & Features
1515

1616
* Incrementally updating multi-pack index files.
1717

18+
* "git reflog" learns "drop" subcommand, that discards the entire
19+
reflog data for a ref.
20+
21+
* A new userdiff driver for ".ini" format configuration files has
22+
been added.
23+
24+
* The job to coalesce loose objects into packfiles in "git
25+
maintenance" now has configurable batch size.
26+
27+
* "git clone" still gave the message about the default branch name;
28+
this message has been turned into an advice message that can be
29+
turned off.
30+
1831

1932
Performance, Internal Implementation, Development Support etc.
2033
--------------------------------------------------------------
@@ -55,6 +68,9 @@ Performance, Internal Implementation, Development Support etc.
5568
5669
* CI update.
5770
71+
* The object layer has been updated to take an explicit repository
72+
instance as a parameter in more code paths.
73+
5874
5975
Fixes since v2.49
6076
-----------------
@@ -107,6 +123,17 @@ Fixes since v2.49
107123
which has been corrected.
108124
(merge 93bab2d04b fr/vimdiff-layout-fixes later to maint).
109125

126+
* Fix our use of zlib corner cases.
127+
(merge 1cb2f293f5 jk/zlib-inflate-fixes later to maint).
128+
129+
* Fix lockfile contention in reftable code on Windows.
130+
(merge 0a3dceabf1 ps/mingw-creat-excl-fix later to maint).
131+
132+
* "git-merge-file" documentation source, which has lines that look
133+
like conflict markers, lacked custom conflict marker size defined,
134+
which has been corrected..
135+
(merge d3b5832381 pw/custom-conflict-marker-size-for-merge-related-docs later to maint).
136+
110137
* Other code cleanup, docfix, build fix, etc.
111138
(merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint).
112139
(merge 2bfd3b3685 ab/decorate-code-cleanup later to maint).
@@ -124,3 +151,5 @@ Fixes since v2.49
124151
(merge 133d065dd6 ta/bulk-checkin-signed-compare-false-warning-fix later to maint).
125152
(merge d2827dc31e es/meson-build-skip-coccinelle later to maint).
126153
(merge ee8edb7156 dk/vimdiff-doc-fix later to maint).
154+
(merge 107d889303 md/t1403-path-is-file later to maint).
155+
(merge abd4192b07 js/comma-semicolon-confusion later to maint).

git-config.html

+6
Original file line numberDiff line numberDiff line change
@@ -6646,6 +6646,12 @@ <h3 id="_variables">Variables</h3>
66466646
loose objects is at least the value of <code>maintenance.loose-objects.auto</code>.
66476647
The default value is 100.</p>
66486648
</dd>
6649+
<dt class="hdlist1">maintenance.loose-objects.batchSize</dt>
6650+
<dd>
6651+
<p>This integer config option controls the maximum number of loose objects
6652+
written into a packfile during the <code>loose-objects</code> task. The default is
6653+
fifty thousand. Use value <code>0</code> to indicate no limit.</p>
6654+
</dd>
66496655
<dt class="hdlist1">maintenance.incremental-repack.auto</dt>
66506656
<dd>
66516657
<p>This integer config option controls how often the <code>incremental-repack</code>

git-maintenance.adoc

+11-7
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,17 @@ loose-objects::
126126
objects that already exist in a pack-file; concurrent Git processes
127127
will examine the pack-file for the object data instead of the loose
128128
object. Second, it creates a new pack-file (starting with "loose-")
129-
containing a batch of loose objects. The batch size is limited to 50
130-
thousand objects to prevent the job from taking too long on a
131-
repository with many loose objects. The `gc` task writes unreachable
132-
objects as loose objects to be cleaned up by a later step only if
133-
they are not re-added to a pack-file; for this reason it is not
134-
advisable to enable both the `loose-objects` and `gc` tasks at the
135-
same time.
129+
containing a batch of loose objects.
130+
+
131+
The batch size defaults to fifty thousand objects to prevent the job from
132+
taking too long on a repository with many loose objects. Use the
133+
`maintenance.loose-objects.batchSize` config option to adjust this size,
134+
including a value of `0` to remove the limit.
135+
+
136+
The `gc` task writes unreachable objects as loose objects to be cleaned up
137+
by a later step only if they are not re-added to a pack-file; for this
138+
reason it is not advisable to enable both the `loose-objects` and `gc`
139+
tasks at the same time.
136140

137141
incremental-repack::
138142
The `incremental-repack` job repacks the object directory

git-maintenance.html

+20-8
Original file line numberDiff line numberDiff line change
@@ -613,13 +613,19 @@ <h2 id="_tasks">TASKS</h2>
613613
objects that already exist in a pack-file; concurrent Git processes
614614
will examine the pack-file for the object data instead of the loose
615615
object. Second, it creates a new pack-file (starting with "loose-")
616-
containing a batch of loose objects. The batch size is limited to 50
617-
thousand objects to prevent the job from taking too long on a
618-
repository with many loose objects. The <code>gc</code> task writes unreachable
619-
objects as loose objects to be cleaned up by a later step only if
620-
they are not re-added to a pack-file; for this reason it is not
621-
advisable to enable both the <code>loose-objects</code> and <code>gc</code> tasks at the
622-
same time.</p>
616+
containing a batch of loose objects.</p>
617+
<div class="paragraph">
618+
<p>The batch size defaults to fifty thousand objects to prevent the job from
619+
taking too long on a repository with many loose objects. Use the
620+
<code>maintenance.loose-objects.batchSize</code> config option to adjust this size,
621+
including a value of <code>0</code> to remove the limit.</p>
622+
</div>
623+
<div class="paragraph">
624+
<p>The <code>gc</code> task writes unreachable objects as loose objects to be cleaned up
625+
by a later step only if they are not re-added to a pack-file; for this
626+
reason it is not advisable to enable both the <code>loose-objects</code> and <code>gc</code>
627+
tasks at the same time.</p>
628+
</div>
623629
</dd>
624630
<dt class="hdlist1">incremental-repack</dt>
625631
<dd>
@@ -1038,6 +1044,12 @@ <h2 id="_configuration">CONFIGURATION</h2>
10381044
loose objects is at least the value of <code>maintenance.loose-objects.auto</code>.
10391045
The default value is 100.</p>
10401046
</dd>
1047+
<dt class="hdlist1">maintenance.loose-objects.batchSize</dt>
1048+
<dd>
1049+
<p>This integer config option controls the maximum number of loose objects
1050+
written into a packfile during the <code>loose-objects</code> task. The default is
1051+
fifty thousand. Use value <code>0</code> to indicate no limit.</p>
1052+
</dd>
10411053
<dt class="hdlist1">maintenance.incremental-repack.auto</dt>
10421054
<dd>
10431055
<p>This integer config option controls how often the <code>incremental-repack</code>
@@ -1063,7 +1075,7 @@ <h2 id="_git">GIT</h2>
10631075
</div>
10641076
<div id="footer">
10651077
<div id="footer-text">
1066-
Last updated 2025-02-14 21:38:14 -0800
1078+
Last updated 2025-04-15 14:25:08 -0700
10671079
</div>
10681080
</div>
10691081
</body>

git-reflog.adoc

+19-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SYNOPSIS
1616
[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
1717
'git reflog delete' [--rewrite] [--updateref]
1818
[--dry-run | -n] [--verbose] <ref>@{<specifier>}...
19+
'git reflog drop' [--all [--single-worktree] | <refs>...]
1920
'git reflog exists' <ref>
2021

2122
DESCRIPTION
@@ -48,10 +49,14 @@ and not reachable from the current tip, are removed from the reflog.
4849
This is typically not used directly by end users -- instead, see
4950
linkgit:git-gc[1].
5051

51-
The "delete" subcommand deletes single entries from the reflog. Its
52-
argument must be an _exact_ entry (e.g. "`git reflog delete
53-
master@{2}`"). This subcommand is also typically not used directly by
54-
end users.
52+
The "delete" subcommand deletes single entries from the reflog, but
53+
not the reflog itself. Its argument must be an _exact_ entry (e.g. "`git
54+
reflog delete master@{2}`"). This subcommand is also typically not used
55+
directly by end users.
56+
57+
The "drop" subcommand completely removes the reflog for the specified
58+
references. This is in contrast to "expire" and "delete", both of which
59+
can be used to delete reflog entries, but not the reflog itself.
5560

5661
The "exists" subcommand checks whether a ref has a reflog. It exits
5762
with zero status if the reflog exists, and non-zero status if it does
@@ -132,6 +137,16 @@ Options for `delete`
132137
`--dry-run`, and `--verbose`, with the same meanings as when they are
133138
used with `expire`.
134139

140+
Options for `drop`
141+
~~~~~~~~~~~~~~~~~~~~
142+
143+
--all::
144+
Drop the reflogs of all references from all worktrees.
145+
146+
--single-worktree::
147+
By default when `--all` is specified, reflogs from all working
148+
trees are dropped. This option limits the processing to reflogs
149+
from the current working tree only.
135150

136151
GIT
137152
---

git-reflog.html

+29-5
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
459459
[--dry-run | -n] [--verbose] [--all [--single-worktree] | &lt;refs&gt;&#8230;&#8203;]
460460
<em>git reflog delete</em> [--rewrite] [--updateref]
461461
[--dry-run | -n] [--verbose] &lt;ref&gt;@{&lt;specifier&gt;}&#8230;&#8203;
462+
<em>git reflog drop</em> [--all [--single-worktree] | &lt;refs&gt;&#8230;&#8203;]
462463
<em>git reflog exists</em> &lt;ref&gt;</pre>
463464
</div>
464465
</div>
@@ -501,10 +502,15 @@ <h2 id="_description">DESCRIPTION</h2>
501502
<a href="git-gc.html">git-gc(1)</a>.</p>
502503
</div>
503504
<div class="paragraph">
504-
<p>The "delete" subcommand deletes single entries from the reflog. Its
505-
argument must be an <em>exact</em> entry (e.g. "<code>git</code> <code>reflog</code> <code>delete</code>
506-
<code>master@</code>{2}"). This subcommand is also typically not used directly by
507-
end users.</p>
505+
<p>The "delete" subcommand deletes single entries from the reflog, but
506+
not the reflog itself. Its argument must be an <em>exact</em> entry (e.g. "<code>git</code>
507+
<code>reflog</code> <code>delete</code> <code>master@</code>{2}"). This subcommand is also typically not used
508+
directly by end users.</p>
509+
</div>
510+
<div class="paragraph">
511+
<p>The "drop" subcommand completely removes the reflog for the specified
512+
references. This is in contrast to "expire" and "delete", both of which
513+
can be used to delete reflog entries, but not the reflog itself.</p>
508514
</div>
509515
<div class="paragraph">
510516
<p>The "exists" subcommand checks whether a ref has a reflog. It exits
@@ -601,6 +607,24 @@ <h3 id="_options_for_delete">Options for <code>delete</code></h3>
601607
<code>--dry-run</code>, and <code>--verbose</code>, with the same meanings as when they are
602608
used with <code>expire</code>.</p>
603609
</div>
610+
<div class="paragraph">
611+
<p>Options for <code>drop</code>
612+
<sub>~</sub><sub>~</sub><sub>~</sub><sub>~</sub><sub>~</sub><sub>~</sub>~~</p>
613+
</div>
614+
<div class="dlist">
615+
<dl>
616+
<dt class="hdlist1">--all</dt>
617+
<dd>
618+
<p>Drop the reflogs of all references from all worktrees.</p>
619+
</dd>
620+
<dt class="hdlist1">--single-worktree</dt>
621+
<dd>
622+
<p>By default when <code>--all</code> is specified, reflogs from all working
623+
trees are dropped. This option limits the processing to reflogs
624+
from the current working tree only.</p>
625+
</dd>
626+
</dl>
627+
</div>
604628
</div>
605629
</div>
606630
</div>
@@ -615,7 +639,7 @@ <h2 id="_git">GIT</h2>
615639
</div>
616640
<div id="footer">
617641
<div id="footer-text">
618-
Last updated 2025-02-14 21:38:14 -0800
642+
Last updated 2025-04-15 14:25:08 -0700
619643
</div>
620644
</div>
621645
</body>

0 commit comments

Comments
 (0)