Skip to content

Commit d5838b4

Browse files
gitstergitster
committed
Autogenerated HTML docs for v2.45.2-648-g1e158
1 parent d007284 commit d5838b4

Some content is hidden

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

52 files changed

+1824
-86
lines changed

‎DecisionMaking.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
<body class="article">
736736
<div id="header">
737737
<h1>Decision-Making Process in the Git Project</h1>
738-
<span id="revdate">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎MyFirstContribution.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎MyFirstObjectWalk.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎RelNotes/2.46.0.txt

+24
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ UI, Workflows & Features
8585
* The "--heads" option of "ls-remote" and "show-ref" has been been
8686
deprecated; "--branches" replaces "--heads".
8787

88+
* For over a year, setting add.interactive.useBuiltin configuration
89+
variable did nothing but giving a "this does not do anything"
90+
warning. The warning has been removed.
91+
8892

8993
Performance, Internal Implementation, Development Support etc.
9094

@@ -173,6 +177,10 @@ Performance, Internal Implementation, Development Support etc.
173177
decisions to deprecate/remove/update various behaviour has been
174178
outlined.
175179

180+
* The pseudo-merge reachability bitmap to help more efficient storage
181+
of the reachability bitmap in a repository with too many refs has
182+
been added.
183+
176184

177185
Fixes since v2.45
178186
-----------------
@@ -306,6 +314,21 @@ Fixes since v2.45
306314
caught earlier in the process that parses the todo list.
307315
(merge 4c063c82e9 pw/rebase-i-error-message later to maint).
308316

317+
* We forgot to normalize the result of getcwd() to NFC on macOS where
318+
all other paths are normalized, which has been corrected. This still
319+
does not address the case where core.precomposeUnicode configuration
320+
is not defined globally.
321+
(merge 71fa8d2212 tb/precompose-getcwd later to maint).
322+
323+
* Earlier we stopped using the tree of HEAD as the default source of
324+
attributes in a bare repository, but failed to document it. This
325+
has been corrected.
326+
(merge 5c71d6b63a jc/no-default-attr-tree-in-bare later to maint).
327+
328+
* "git update-server-info" and "git commit-graph --write" have been
329+
updated to use the tempfile API to avoid leaving cruft after
330+
failing.
331+
309332
* Other code cleanup, docfix, build fix, etc.
310333
(merge a5a4cb7b27 rs/diff-parseopts-cleanup later to maint).
311334
(merge 55702c543e fa/p4-error later to maint).
@@ -318,3 +341,4 @@ Fixes since v2.45
318341
(merge 36d900d2b0 rs/difftool-env-simplify later to maint).
319342
(merge e83055ecb0 ds/doc-add-interactive-singlekey later to maint).
320343
(merge f1160393c1 ds/ahead-behind-fix later to maint).
344+
(merge bf6a86236e jc/worktree-git-path later to maint).

‎ReviewingGuidelines.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎SubmittingPatches.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎ToolsForGit.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div class="sect1">

‎config.txt

+2
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@ include::config/apply.txt[]
384384

385385
include::config/attr.txt[]
386386

387+
include::config/bitmap-pseudo-merge.txt[]
388+
387389
include::config/blame.txt[]
388390

389391
include::config/branch.txt[]

‎everyday.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div id="preamble">

‎git-add.html

-11
Original file line numberDiff line numberDiff line change
@@ -1390,17 +1390,6 @@ <h2 id="_configuration">CONFIGURATION</h2>
13901390
variables.
13911391
</p>
13921392
</dd>
1393-
<dt class="hdlist1">
1394-
add.interactive.useBuiltin
1395-
</dt>
1396-
<dd>
1397-
<p>
1398-
Unused configuration variable. Used in Git versions v2.25.0 to
1399-
v2.36.0 to enable the built-in version of <a href="git-add.html">git-add(1)</a>'s
1400-
interactive mode, which then became the default in Git
1401-
versions v2.37.0 to v2.39.0.
1402-
</p>
1403-
</dd>
14041393
</dl></div>
14051394
</div>
14061395
</div>

‎git-config.html

+128-14
Original file line numberDiff line numberDiff line change
@@ -2125,17 +2125,6 @@ <h3 id="_variables">Variables</h3>
21252125
</p>
21262126
</dd>
21272127
<dt class="hdlist1">
2128-
add.interactive.useBuiltin
2129-
</dt>
2130-
<dd>
2131-
<p>
2132-
Unused configuration variable. Used in Git versions v2.25.0 to
2133-
v2.36.0 to enable the built-in version of <a href="git-add.html">git-add(1)</a>'s
2134-
interactive mode, which then became the default in Git
2135-
versions v2.37.0 to v2.39.0.
2136-
</p>
2137-
</dd>
2138-
<dt class="hdlist1">
21392128
advice.*
21402129
</dt>
21412130
<dd>
@@ -2669,13 +2658,138 @@ <h3 id="_variables">Variables</h3>
26692658
<dd>
26702659
<p>
26712660
A reference to a tree in the repository from which to read attributes,
2672-
instead of the <code>.gitattributes</code> file in the working tree. In a bare
2673-
repository, this defaults to <code>HEAD:.gitattributes</code>. If the value does
2674-
not resolve to a valid tree object, an empty tree is used instead.
2661+
instead of the <code>.gitattributes</code> file in the working tree. If the value
2662+
does not resolve to a valid tree object, an empty tree is used instead.
26752663
When the <code>GIT_ATTR_SOURCE</code> environment variable or <code>--attr-source</code>
26762664
command line option are used, this configuration variable has no effect.
26772665
</p>
26782666
</dd>
2667+
</dl></div>
2668+
<div class="admonitionblock">
2669+
<table><tr>
2670+
<td class="icon">
2671+
<div class="title">Note</div>
2672+
</td>
2673+
<td class="content">The configuration options in <code>bitmapPseudoMerge.*</code> are considered
2674+
EXPERIMENTAL and may be subject to change or be removed entirely in the
2675+
future. For more information about the pseudo-merge bitmap feature, see
2676+
the "Pseudo-merge bitmaps" section of <a href="gitpacking.html">gitpacking(7)</a>.</td>
2677+
</tr></table>
2678+
</div>
2679+
<div class="dlist"><dl>
2680+
<dt class="hdlist1">
2681+
bitmapPseudoMerge.&lt;name&gt;.pattern
2682+
</dt>
2683+
<dd>
2684+
<p>
2685+
Regular expression used to match reference names. Commits
2686+
pointed to by references matching this pattern (and meeting
2687+
the below criteria, like <code>bitmapPseudoMerge.&lt;name&gt;.sampleRate</code>
2688+
and <code>bitmapPseudoMerge.&lt;name&gt;.threshold</code>) will be considered
2689+
for inclusion in a pseudo-merge bitmap.
2690+
</p>
2691+
<div class="paragraph"><p>Commits are grouped into pseudo-merge groups based on whether or not
2692+
any reference(s) that point at a given commit match the pattern, which
2693+
is an extended regular expression.</p></div>
2694+
<div class="paragraph"><p>Within a pseudo-merge group, commits may be further grouped into
2695+
sub-groups based on the capture groups in the pattern. These
2696+
sub-groupings are formed from the regular expressions by concatenating
2697+
any capture groups from the regular expression, with a <em>-</em> dash in
2698+
between.</p></div>
2699+
<div class="paragraph"><p>For example, if the pattern is <code>refs/tags/</code>, then all tags (provided
2700+
they meet the below criteria) will be considered candidates for the
2701+
same pseudo-merge group. However, if the pattern is instead
2702+
<code>refs/remotes/([0-9])+/tags/</code>, then tags from different remotes will
2703+
be grouped into separate pseudo-merge groups, based on the remote
2704+
number.</p></div>
2705+
</dd>
2706+
<dt class="hdlist1">
2707+
bitmapPseudoMerge.&lt;name&gt;.decay
2708+
</dt>
2709+
<dd>
2710+
<p>
2711+
Determines the rate at which consecutive pseudo-merge bitmap
2712+
groups decrease in size. Must be non-negative. This parameter
2713+
can be thought of as <code>k</code> in the function <code>f(n) = C * n^-k</code>,
2714+
where <code>f(n)</code> is the size of the `n`th group.
2715+
</p>
2716+
<div class="paragraph"><p>Setting the decay rate equal to <code>0</code> will cause all groups to be the
2717+
same size. Setting the decay rate equal to <code>1</code> will cause the <code>n`th
2718+
group to be `1/n</code> the size of the initial group. Higher values of the
2719+
decay rate cause consecutive groups to shrink at an increasing rate.
2720+
The default is <code>1</code>.</p></div>
2721+
<div class="paragraph"><p>If all groups are the same size, it is possible that groups containing
2722+
newer commits will be able to be used less often than earlier groups,
2723+
since it is more likely that the references pointing at newer commits
2724+
will be updated more often than a reference pointing at an old commit.</p></div>
2725+
</dd>
2726+
<dt class="hdlist1">
2727+
bitmapPseudoMerge.&lt;name&gt;.sampleRate
2728+
</dt>
2729+
<dd>
2730+
<p>
2731+
Determines the proportion of non-bitmapped commits (among
2732+
reference tips) which are selected for inclusion in an
2733+
unstable pseudo-merge bitmap. Must be between <code>0</code> and <code>1</code>
2734+
(inclusive). The default is <code>1</code>.
2735+
</p>
2736+
</dd>
2737+
<dt class="hdlist1">
2738+
bitmapPseudoMerge.&lt;name&gt;.threshold
2739+
</dt>
2740+
<dd>
2741+
<p>
2742+
Determines the minimum age of non-bitmapped commits (among
2743+
reference tips, as above) which are candidates for inclusion
2744+
in an unstable pseudo-merge bitmap. The default is
2745+
<code>1.week.ago</code>.
2746+
</p>
2747+
</dd>
2748+
<dt class="hdlist1">
2749+
bitmapPseudoMerge.&lt;name&gt;.maxMerges
2750+
</dt>
2751+
<dd>
2752+
<p>
2753+
Determines the maximum number of pseudo-merge commits among
2754+
which commits may be distributed.
2755+
</p>
2756+
<div class="paragraph"><p>For pseudo-merge groups whose pattern does not contain any capture
2757+
groups, this setting is applied for all commits matching the regular
2758+
expression. For patterns that have one or more capture groups, this
2759+
setting is applied for each distinct capture group.</p></div>
2760+
<div class="paragraph"><p>For example, if your capture group is <code>refs/tags/</code>, then this setting
2761+
will distribute all tags into a maximum of <code>maxMerges</code> pseudo-merge
2762+
commits. However, if your capture group is, say,
2763+
<code>refs/remotes/([0-9]+)/tags/</code>, then this setting will be applied to
2764+
each remote&#8217;s set of tags individually.</p></div>
2765+
<div class="paragraph"><p>Must be non-negative. The default value is 64.</p></div>
2766+
</dd>
2767+
<dt class="hdlist1">
2768+
bitmapPseudoMerge.&lt;name&gt;.stableThreshold
2769+
</dt>
2770+
<dd>
2771+
<p>
2772+
Determines the minimum age of commits (among reference tips,
2773+
as above, however stable commits are still considered
2774+
candidates even when they have been covered by a bitmap) which
2775+
are candidates for a stable a pseudo-merge bitmap. The default
2776+
is <code>1.month.ago</code>.
2777+
</p>
2778+
<div class="paragraph"><p>Setting this threshold to a smaller value (e.g., 1.week.ago) will cause
2779+
more stable groups to be generated (which impose a one-time generation
2780+
cost) but those groups will likely become stale over time. Using a
2781+
larger value incurs the opposite penalty (fewer stable groups which are
2782+
more useful).</p></div>
2783+
</dd>
2784+
<dt class="hdlist1">
2785+
bitmapPseudoMerge.&lt;name&gt;.stableSize
2786+
</dt>
2787+
<dd>
2788+
<p>
2789+
Determines the size (in number of commits) of a stable
2790+
psuedo-merge bitmap. The default is <code>512</code>.
2791+
</p>
2792+
</dd>
26792793
<dt class="hdlist1">
26802794
blame.blankBoundary
26812795
</dt>

‎git-remote-helpers.html

+1-1
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">2024-06-20</span>
738+
<span id="revdate">2024-06-24</span>
739739
</div>
740740
<div id="content">
741741
<div id="preamble">

0 commit comments

Comments
 (0)