From dc01b607064d63e92388b9097400e9e31812db14 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 10 Sep 2024 13:24:23 -0700 Subject: [PATCH] Autogenerated HTML docs for v2.46.0-551-gc5ee8 --- BreakingChanges.txt | 20 ++++++++++++++++++++ DecisionMaking.html | 2 +- MyFirstContribution.html | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/2.47.0.txt | 10 ++++++++++ ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- everyday.html | 2 +- git-config.html | 8 ++++++++ git-diff.html | 4 ++++ git-merge.html | 4 ++++ git-remote-helpers.html | 2 +- howto/keep-canonical-history-correct.html | 4 ++-- howto/maintain-git.html | 4 ++-- howto/new-command.html | 4 ++-- howto/rebase-from-internal-branch.html | 4 ++-- howto/rebuild-from-update-hook.html | 4 ++-- howto/recover-corrupted-blob-object.html | 4 ++-- howto/recover-corrupted-object-harder.html | 4 ++-- howto/revert-a-faulty-merge.html | 4 ++-- howto/revert-branch-rebase.html | 4 ++-- howto/separating-topic-branches.html | 4 ++-- howto/setup-git-server-over-http.html | 4 ++-- howto/update-hook-example.html | 4 ++-- howto/use-git-daemon.html | 4 ++-- howto/using-merge-subtree.html | 4 ++-- howto/using-signed-tag-in-pull-request.html | 4 ++-- mergetools-diff.txt | 1 + mergetools-merge.txt | 1 + technical/api-error-handling.html | 2 +- technical/api-index.html | 2 +- technical/api-merge.html | 2 +- technical/api-parse-options.html | 2 +- technical/api-simple-ipc.html | 2 +- technical/api-trace2.html | 2 +- technical/bitmap-format.html | 2 +- technical/bundle-uri.html | 2 +- technical/hash-function-transition.html | 2 +- technical/long-running-process-protocol.html | 2 +- technical/multi-pack-index.html | 2 +- technical/pack-heuristics.html | 2 +- technical/parallel-checkout.html | 2 +- technical/partial-clone.html | 2 +- technical/platform-support.html | 2 +- technical/racy-git.html | 2 +- technical/scalar.html | 2 +- technical/send-pack-pipeline.html | 2 +- technical/shallow.html | 2 +- technical/trivial-merge.html | 2 +- technical/unit-tests.html | 2 +- 51 files changed, 107 insertions(+), 59 deletions(-) diff --git a/BreakingChanges.txt b/BreakingChanges.txt index 0532bfcf..2b646656 100644 --- a/BreakingChanges.txt +++ b/BreakingChanges.txt @@ -115,6 +115,26 @@ info/grafts as outdated, 2014-03-05) and will be removed. + Cf. <20140304174806.GA11561@sigill.intra.peff.net>. +* The git-pack-redundant(1) command can be used to remove redundant pack files. + The subcommand is unusably slow and the reason why nobody reports it as a + performance bug is suspected to be the absense of users. We have nominated + the command for removal and have started to emit a user-visible warning in + c3b58472be (pack-redundant: gauge the usage before proposing its removal, + 2020-08-25) whenever the command is executed. ++ +So far there was a single complaint about somebody still using the command, but +that complaint did not cause us to reverse course. On the contrary, we have +doubled down on the deprecation and starting with 4406522b76 (pack-redundant: +escalate deprecation warning to an error, 2023-03-23), the command dies unless +the user passes the `--i-still-use-this` option. ++ +There have not been any subsequent complaints, so this command will finally be +removed. ++ +Cf. , + , + <20230323204047.GA9290@coredump.intra.peff.net>, + == Superseded features that will not be deprecated Some features have gained newer replacements that aim to improve the design in diff --git a/DecisionMaking.html b/DecisionMaking.html index f1e2c71c..15a093c7 100644 --- a/DecisionMaking.html +++ b/DecisionMaking.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 61f38ab7..4756ee38 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 633cec21..0af9e7f1 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/RelNotes/2.47.0.txt b/RelNotes/2.47.0.txt index 7d4ac729..2aee05e0 100644 --- a/RelNotes/2.47.0.txt +++ b/RelNotes/2.47.0.txt @@ -51,6 +51,10 @@ UI, Workflows & Features * "git send-email" learned "--mailmap" option to allow rewriting the recipient addresses. + * "git mergetool" learned to use VSCode as a merge backend. + + * "git pack-redundant" has been marked for removal in Git 3.0. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -196,6 +200,11 @@ Fixes since v2.46 * The code path for compacting reftable files saw some bugfixes against concurrent operation. + * The code forgot to discard unnecessary in-core commit buffer data + for commits that "git log --skip=" traversed but omitted + from the output, which has been corrected. + (merge 6bd2ae67a5 jk/free-commit-buffer-of-skipped-commits later to maint). + * Other code cleanup, docfix, build fix, etc. (merge bb0498b1bb jc/how-to-maintain-updates later to maint). (merge 0d66f601a9 jc/tests-no-useless-tee later to maint). @@ -206,3 +215,4 @@ Fixes since v2.46 (merge 596f4ff6ad cl/config-regexp-docfix later to maint). (merge 4881328617 aa/cat-file-batch-output-doc later to maint). (merge 1609470409 jc/config-doc-update later to maint). + (merge d4dc0efd7d rj/compat-terminal-unused-fix later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 627897e5..91cbbd0d 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 43f6592b..5c2e2f57 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/ToolsForGit.html b/ToolsForGit.html index a598a9a2..1770bae6 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/everyday.html b/everyday.html index f8bb6c45..d231a2ce 100644 --- a/everyday.html +++ b/everyday.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/git-config.html b/git-config.html index cb2e8c0b..b69ef087 100644 --- a/git-config.html +++ b/git-config.html @@ -4256,6 +4256,10 @@ conversion outputs. See gitattributes(5) for d

Use Vim

+
vscode
+
+

Use Visual Studio Code (requires a graphical session)

+
winmerge

Use WinMerge (requires a graphical session)

@@ -6763,6 +6767,10 @@ corresponding mergetool.<guitool>.cmd variable is defined.

Use Vim where only the MERGED file is shown

+
vscode
+
+

Use Visual Studio Code (requires a graphical session)

+
winmerge

Use WinMerge (requires a graphical session)

diff --git a/git-diff.html b/git-diff.html index dbb02294..2baa6f34 100644 --- a/git-diff.html +++ b/git-diff.html @@ -2623,6 +2623,10 @@ conversion outputs. See gitattributes(5) for d

Use Vim

+
vscode
+
+

Use Visual Studio Code (requires a graphical session)

+
winmerge

Use WinMerge (requires a graphical session)

diff --git a/git-merge.html b/git-merge.html index c2ee0d69..fb868117 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1636,6 +1636,10 @@ corresponding mergetool.<guitool>.cmd variable is defined.

Use Vim where only the MERGED file is shown

+
vscode
+
+

Use Visual Studio Code (requires a graphical session)

+
winmerge

Use WinMerge (requires a graphical session)

diff --git a/git-remote-helpers.html b/git-remote-helpers.html index e250f48d..28d589f0 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 2f7af499..1d29f141 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -442,7 +442,7 @@ pre>code {
@@ -705,7 +705,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 1f8c9513..10274ed7 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -442,7 +442,7 @@ pre>code {
@@ -1242,7 +1242,7 @@ $ git update-ref -d $mf/ai/topic
diff --git a/howto/new-command.html b/howto/new-command.html index fed9f71b..ec09642e 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -442,7 +442,7 @@ pre>code {
@@ -584,7 +584,7 @@ letter [PATCH 0/n].

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 5273c7b8..0439f853 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -442,7 +442,7 @@ pre>code {
@@ -656,7 +656,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 2375a6d9..a7fb0460 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -442,7 +442,7 @@ pre>code {
@@ -563,7 +563,7 @@ some locking mechanism for this.

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index df197c0b..1e73eecb 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -442,7 +442,7 @@ pre>code {
@@ -641,7 +641,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 3b776842..99173cc7 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -442,7 +442,7 @@ pre>code {
@@ -967,7 +967,7 @@ int main(int argc, char **argv)
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index d6620caf..bd222ea2 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -442,7 +442,7 @@ pre>code {
@@ -829,7 +829,7 @@ P---o---o---M---x---x---W---x---M2
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 3128afe2..57086974 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -442,7 +442,7 @@ pre>code {
@@ -649,7 +649,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index b9c171ae..1153f242 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -442,7 +442,7 @@ pre>code {
@@ -568,7 +568,7 @@ o---o"master"
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index c4741469..44d3f76e 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -442,7 +442,7 @@ pre>code {
@@ -882,7 +882,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 6c5b5712..a518d3e6 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -442,7 +442,7 @@ pre>code {
@@ -648,7 +648,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index fdc8b26d..c1e3b4ec 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -442,7 +442,7 @@ pre>code {
@@ -524,7 +524,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 6bceb198..fd97a9dc 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -442,7 +442,7 @@ pre>code {
@@ -554,7 +554,7 @@ to.

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index fd4ffc89..c33341ac 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -442,7 +442,7 @@ pre>code {
@@ -712,7 +712,7 @@ as part of the merge commit.

diff --git a/mergetools-diff.txt b/mergetools-diff.txt index a2876794..3e8a24c2 100644 --- a/mergetools-diff.txt +++ b/mergetools-diff.txt @@ -20,5 +20,6 @@ `smerge`;; Use Sublime Merge (requires a graphical session) `tkdiff`;; Use TkDiff (requires a graphical session) `vimdiff`;; Use Vim +`vscode`;; Use Visual Studio Code (requires a graphical session) `winmerge`;; Use WinMerge (requires a graphical session) `xxdiff`;; Use xxdiff (requires a graphical session) diff --git a/mergetools-merge.txt b/mergetools-merge.txt index f34a03f2..f8b97401 100644 --- a/mergetools-merge.txt +++ b/mergetools-merge.txt @@ -29,5 +29,6 @@ `vimdiff1`;; Use Vim with a 2 panes layout (LOCAL and REMOTE) `vimdiff2`;; Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE) `vimdiff3`;; Use Vim where only the MERGED file is shown +`vscode`;; Use Visual Studio Code (requires a graphical session) `winmerge`;; Use WinMerge (requires a graphical session) `xxdiff`;; Use xxdiff (requires a graphical session) diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index 8bc2273d..32c031d4 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-index.html b/technical/api-index.html index 087effee..451b3575 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-merge.html b/technical/api-merge.html index 89d72261..4f89d413 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index f8b73b03..7335354b 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index 20904517..147c5cf5 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index a7bec54b..3936d38b 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 54052e25..bfffde10 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 7d302b7c..59a6cd9d 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 23d1d5b8..1573aa01 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 5f8f30e7..0cc88ea7 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 278d6d0c..38e3a1e2 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 9bb87237..9740e40f 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 441a6701..bda4f557 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/partial-clone.html b/technical/partial-clone.html index a4453069..29615d76 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/platform-support.html b/technical/platform-support.html index 1c6ec7e5..6424673f 100644 --- a/technical/platform-support.html +++ b/technical/platform-support.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/racy-git.html b/technical/racy-git.html index 3db6591b..1a9211c8 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/scalar.html b/technical/scalar.html index 3c7f12a6..1b2443b5 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index 78ce2f5b..8aaa04ed 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/shallow.html b/technical/shallow.html index b2b46850..65e407f5 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 78c0e1f0..ff256d27 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
diff --git a/technical/unit-tests.html b/technical/unit-tests.html index d648b9cf..1f4352af 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html @@ -437,7 +437,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
-- 2.11.4.GIT