Skip to content

Commit dc01b60

Browse files
committed
Autogenerated HTML docs for v2.46.0-551-gc5ee8
1 parent 3ab56f3 commit dc01b60

Some content is hidden

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

51 files changed

+107
-59
lines changed

BreakingChanges.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,26 @@ info/grafts as outdated, 2014-03-05) and will be removed.
115115
+
116116
117117

118+
* The git-pack-redundant(1) command can be used to remove redundant pack files.
119+
The subcommand is unusably slow and the reason why nobody reports it as a
120+
performance bug is suspected to be the absense of users. We have nominated
121+
the command for removal and have started to emit a user-visible warning in
122+
c3b58472be (pack-redundant: gauge the usage before proposing its removal,
123+
2020-08-25) whenever the command is executed.
124+
+
125+
So far there was a single complaint about somebody still using the command, but
126+
that complaint did not cause us to reverse course. On the contrary, we have
127+
doubled down on the deprecation and starting with 4406522b76 (pack-redundant:
128+
escalate deprecation warning to an error, 2023-03-23), the command dies unless
129+
the user passes the `--i-still-use-this` option.
130+
+
131+
There have not been any subsequent complaints, so this command will finally be
132+
removed.
133+
+
134+
135+
<CAKvOHKAFXQwt4D8yUCCkf_TQL79mYaJ=KAKhtpDNTvHJFuX1NA@mail.gmail.com>,
136+
137+
118138
== Superseded features that will not be deprecated
119139

120140
Some features have gained newer replacements that aim to improve the design in

DecisionMaking.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Decision-Making Process in the Git Project</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

MyFirstContribution.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>My First Contribution to the Git Project</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

MyFirstObjectWalk.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>My First Object Walk</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

RelNotes/2.47.0.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ UI, Workflows & Features
5151
* "git send-email" learned "--mailmap" option to allow rewriting the
5252
recipient addresses.
5353

54+
* "git mergetool" learned to use VSCode as a merge backend.
55+
56+
* "git pack-redundant" has been marked for removal in Git 3.0.
57+
5458

5559
Performance, Internal Implementation, Development Support etc.
5660
--------------------------------------------------------------
@@ -196,6 +200,11 @@ Fixes since v2.46
196200
* The code path for compacting reftable files saw some bugfixes
197201
against concurrent operation.
198202

203+
* The code forgot to discard unnecessary in-core commit buffer data
204+
for commits that "git log --skip=<number>" traversed but omitted
205+
from the output, which has been corrected.
206+
(merge 6bd2ae67a5 jk/free-commit-buffer-of-skipped-commits later to maint).
207+
199208
* Other code cleanup, docfix, build fix, etc.
200209
(merge bb0498b1bb jc/how-to-maintain-updates later to maint).
201210
(merge 0d66f601a9 jc/tests-no-useless-tee later to maint).
@@ -206,3 +215,4 @@ Fixes since v2.46
206215
(merge 596f4ff6ad cl/config-regexp-docfix later to maint).
207216
(merge 4881328617 aa/cat-file-batch-output-doc later to maint).
208217
(merge 1609470409 jc/config-doc-update later to maint).
218+
(merge d4dc0efd7d rj/compat-terminal-unused-fix later to maint).

ReviewingGuidelines.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Reviewing Patches in the Git Project</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

SubmittingPatches.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Submitting Patches</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

ToolsForGit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Tools for developing Git</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

everyday.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Everyday Git With 20 Commands Or So</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

git-config.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4256,6 +4256,10 @@ <h3 id="_variables">Variables</h3>
42564256
<dd>
42574257
<p>Use Vim</p>
42584258
</dd>
4259+
<dt class="hdlist1"><code>vscode</code></dt>
4260+
<dd>
4261+
<p>Use Visual Studio Code (requires a graphical session)</p>
4262+
</dd>
42594263
<dt class="hdlist1"><code>winmerge</code></dt>
42604264
<dd>
42614265
<p>Use WinMerge (requires a graphical session)</p>
@@ -6763,6 +6767,10 @@ <h3 id="_variables">Variables</h3>
67636767
<dd>
67646768
<p>Use Vim where only the MERGED file is shown</p>
67656769
</dd>
6770+
<dt class="hdlist1"><code>vscode</code></dt>
6771+
<dd>
6772+
<p>Use Visual Studio Code (requires a graphical session)</p>
6773+
</dd>
67666774
<dt class="hdlist1"><code>winmerge</code></dt>
67676775
<dd>
67686776
<p>Use WinMerge (requires a graphical session)</p>

git-diff.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2623,6 +2623,10 @@ <h2 id="_configuration">CONFIGURATION</h2>
26232623
<dd>
26242624
<p>Use Vim</p>
26252625
</dd>
2626+
<dt class="hdlist1"><code>vscode</code></dt>
2627+
<dd>
2628+
<p>Use Visual Studio Code (requires a graphical session)</p>
2629+
</dd>
26262630
<dt class="hdlist1"><code>winmerge</code></dt>
26272631
<dd>
26282632
<p>Use WinMerge (requires a graphical session)</p>

git-merge.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1636,6 +1636,10 @@ <h2 id="_configuration">CONFIGURATION</h2>
16361636
<dd>
16371637
<p>Use Vim where only the MERGED file is shown</p>
16381638
</dd>
1639+
<dt class="hdlist1"><code>vscode</code></dt>
1640+
<dd>
1641+
<p>Use Visual Studio Code (requires a graphical session)</p>
1642+
</dd>
16391643
<dt class="hdlist1"><code>winmerge</code></dt>
16401644
<dd>
16411645
<p>Use WinMerge (requires a graphical session)</p>

git-remote-helpers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>git-remote-helpers</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">

howto/keep-canonical-history-correct.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>Keep authoritative canonical history correct with git pull</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -705,7 +705,7 @@ <h1>Keep authoritative canonical history correct with git pull</h1>
705705
</div>
706706
<div id="footer">
707707
<div id="footer-text">
708-
Last updated 2024-09-06 10:41:12 -0700
708+
Last updated 2024-09-10 13:23:33 -0700
709709
</div>
710710
</div>
711711
</body>

howto/maintain-git.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to maintain Git</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -1242,7 +1242,7 @@ <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
12421242
</div>
12431243
<div id="footer">
12441244
<div id="footer-text">
1245-
Last updated 2024-09-06 10:41:12 -0700
1245+
Last updated 2024-09-10 13:23:33 -0700
12461246
</div>
12471247
</div>
12481248
</body>

howto/new-command.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to integrate new subcommands</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -584,7 +584,7 @@ <h2 id="_integrating_a_command">Integrating a command</h2>
584584
</div>
585585
<div id="footer">
586586
<div id="footer-text">
587-
Last updated 2024-09-06 10:41:11 -0700
587+
Last updated 2024-09-10 13:23:32 -0700
588588
</div>
589589
</div>
590590
</body>

howto/rebase-from-internal-branch.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to rebase from an internal branch</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -656,7 +656,7 @@ <h1>How to rebase from an internal branch</h1>
656656
</div>
657657
<div id="footer">
658658
<div id="footer-text">
659-
Last updated 2024-09-06 10:41:12 -0700
659+
Last updated 2024-09-10 13:23:33 -0700
660660
</div>
661661
</div>
662662
</body>

howto/rebuild-from-update-hook.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to rebuild from update hook</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -563,7 +563,7 @@ <h1>How to rebuild from update hook</h1>
563563
</div>
564564
<div id="footer">
565565
<div id="footer-text">
566-
Last updated 2024-09-06 10:41:12 -0700
566+
Last updated 2024-09-10 13:23:33 -0700
567567
</div>
568568
</div>
569569
</body>

howto/recover-corrupted-blob-object.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to recover a corrupted blob object</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -641,7 +641,7 @@ <h1>How to recover a corrupted blob object</h1>
641641
</div>
642642
<div id="footer">
643643
<div id="footer-text">
644-
Last updated 2024-09-06 10:41:12 -0700
644+
Last updated 2024-09-10 13:23:33 -0700
645645
</div>
646646
</div>
647647
</body>

howto/recover-corrupted-object-harder.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to recover an object from scratch</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -967,7 +967,7 @@ <h2 id="_the_adventure_continues">The adventure continues&#8230;&#8203;</h2>
967967
</div>
968968
<div id="footer">
969969
<div id="footer-text">
970-
Last updated 2024-09-06 10:41:12 -0700
970+
Last updated 2024-09-10 13:23:33 -0700
971971
</div>
972972
</div>
973973
</body>

howto/revert-a-faulty-merge.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to revert a faulty merge</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -829,7 +829,7 @@ <h1>How to revert a faulty merge</h1>
829829
</div>
830830
<div id="footer">
831831
<div id="footer-text">
832-
Last updated 2024-09-06 10:41:12 -0700
832+
Last updated 2024-09-10 13:23:33 -0700
833833
</div>
834834
</div>
835835
</body>

howto/revert-branch-rebase.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to revert an existing commit</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -649,7 +649,7 @@ <h1>How to revert an existing commit</h1>
649649
</div>
650650
<div id="footer">
651651
<div id="footer-text">
652-
Last updated 2024-09-06 10:41:11 -0700
652+
Last updated 2024-09-10 13:23:32 -0700
653653
</div>
654654
</div>
655655
</body>

howto/separating-topic-branches.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to separate topic branches</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -568,7 +568,7 @@ <h1>How to separate topic branches</h1>
568568
</div>
569569
<div id="footer">
570570
<div id="footer-text">
571-
Last updated 2024-09-06 10:41:12 -0700
571+
Last updated 2024-09-10 13:23:33 -0700
572572
</div>
573573
</div>
574574
</body>

howto/setup-git-server-over-http.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to setup Git server over http</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -882,7 +882,7 @@ <h2 id="_troubleshooting">Troubleshooting:</h2>
882882
</div>
883883
<div id="footer">
884884
<div id="footer-text">
885-
Last updated 2024-09-06 10:41:12 -0700
885+
Last updated 2024-09-10 13:23:32 -0700
886886
</div>
887887
</div>
888888
</body>

howto/update-hook-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
<div id="header">
443443
<h1>How to use the update hook</h1>
444444
<div class="details">
445-
<span id="revdate">2024-09-06</span>
445+
<span id="revdate">2024-09-10</span>
446446
</div>
447447
</div>
448448
<div id="content">
@@ -648,7 +648,7 @@ <h1>How to use the update hook</h1>
648648
</div>
649649
<div id="footer">
650650
<div id="footer-text">
651-
Last updated 2024-09-06 10:41:12 -0700
651+
Last updated 2024-09-10 13:23:32 -0700
652652
</div>
653653
</div>
654654
</body>

0 commit comments

Comments
 (0)