From 902ce170b4bb997787626f866250f6d81899dc62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 21 Aug 2024 14:02:37 -0700 Subject: [PATCH] Autogenerated HTML docs for v2.46.0-288-g3a736 --- DecisionMaking.html | 2 +- MyFirstContribution.html | 2 +- MyFirstObjectWalk.html | 2 +- RelNotes/2.47.0.txt | 9 +++++++++ ReviewingGuidelines.html | 2 +- SubmittingPatches.html | 2 +- ToolsForGit.html | 2 +- everyday.html | 2 +- git-diff-tree.html | 4 ++-- git-diff-tree.txt | 2 +- git-remote-helpers.html | 2 +- git-svn.html | 16 ++++++++-------- git-svn.txt | 14 +++++++------- gittutorial.html | 4 ++-- gittutorial.txt | 2 +- howto-index.html | 4 ++-- howto/keep-canonical-history-correct.html | 4 ++-- howto/maintain-git.html | 11 +++++++++-- howto/maintain-git.txt | 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 ++-- 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 +- 53 files changed, 102 insertions(+), 82 deletions(-) diff --git a/DecisionMaking.html b/DecisionMaking.html index 585acd65..fade94af 100644 --- a/DecisionMaking.html +++ b/DecisionMaking.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index f5e7a5ff..f23d09ba 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 13d519a2..e158ea63 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 ba1a9cbc..24dd4304 100644 --- a/RelNotes/2.47.0.txt +++ b/RelNotes/2.47.0.txt @@ -27,6 +27,9 @@ UI, Workflows & Features * Support to specify ref backend for submodules has been enhanced. + * "git svn" has been taught about svn:global-ignores property + recent versions of Subversion has. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -142,6 +145,10 @@ Fixes since v2.46 crashed, forgetting to prepare a temporary object store needed. (merge a77554ea09 xx/diff-tree-remerge-diff-fix later to maint). + * "git bundle unbundle" outside a repository triggered a BUG() + unnecessarily, which has been corrected. + (merge 96a9a3e42e ps/bundle-outside-repo-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge bb0498b1bb jc/how-to-maintain-updates later to maint). (merge 7c7516b8db jc/jl-git-no-advice-fix later to maint). @@ -153,3 +160,5 @@ Fixes since v2.46 (merge 67be8c4de5 jc/document-use-of-local later to maint). (merge 098be29f5b rs/t-example-simplify later to maint). (merge 0d66f601a9 jc/tests-no-useless-tee later to maint). + (merge 170cdfc5a4 jc/grammo-fixes later to maint). + (merge 983555a1f2 jc/how-to-maintain-updates later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index d8299808..12c5fedf 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 5f6512bf..39fad6f0 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/ToolsForGit.html b/ToolsForGit.html index 6c62dc6e..7b4f1037 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/everyday.html b/everyday.html index c7f3153f..730e5359 100644 --- a/everyday.html +++ b/everyday.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/git-diff-tree.html b/git-diff-tree.html index 9a0c8101..5b9aa186 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1575,7 +1575,7 @@ to gpg --verify and show the output.

--no-commit-id

git diff-tree outputs a line with the commit ID when -applicable. This flag suppressed the commit ID output.

+applicable. This flag suppresses the commit ID output.

-c
@@ -2995,7 +2995,7 @@ the pathname, but if that is NUL, the record will show two paths. diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 143318c4..09286a85 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -88,7 +88,7 @@ include::pretty-options.txt[] --no-commit-id:: 'git diff-tree' outputs a line with the commit ID when - applicable. This flag suppressed the commit ID output. + applicable. This flag suppresses the commit ID output. -c:: This flag changes the way a merge commit is displayed diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 3d530a18..9984b73c 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -442,7 +442,7 @@ pre>code {
diff --git a/git-svn.html b/git-svn.html index 79dbe869..259e1cf8 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1048,15 +1048,15 @@ independently of git svn functions.

create-ignore
-

Recursively finds the svn:ignore property on directories and -creates matching .gitignore files. The resulting files are staged to -be committed, but are not committed. Use -r/--revision to refer to a -specific revision.

+

Recursively finds the svn:ignore and svn:global-ignores properties +on directories and creates matching .gitignore files. The resulting +files are staged to be committed, but are not committed. Use +-r/--revision to refer to a specific revision.

show-ignore
-

Recursively finds and lists the svn:ignore property on -directories. The output is suitable for appending to +

Recursively finds and lists the svn:ignore and svn:global-ignores +properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file.

mkdirs
@@ -1589,7 +1589,7 @@ for rewriteRoot and rewriteUUID which can be used together.

# Now commit your changes (that were committed previously using Git) to SVN, # as well as automatically updating your working HEAD: git svn dcommit -# Append svn:ignore settings to the default Git exclude file: +# Append svn:ignore and svn:global-ignores settings to the default Git exclude file: git svn show-ignore >> .git/info/exclude
@@ -1977,7 +1977,7 @@ and imports all SVN tags as branches, prefixing the tag name with tags/
diff --git a/git-svn.txt b/git-svn.txt index 43c68c2e..bcf7d84a 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -431,14 +431,14 @@ Any other arguments are passed directly to 'git log' independently of 'git svn' functions. 'create-ignore':: - Recursively finds the svn:ignore property on directories and - creates matching .gitignore files. The resulting files are staged to - be committed, but are not committed. Use -r/--revision to refer to a - specific revision. + Recursively finds the svn:ignore and svn:global-ignores properties + on directories and creates matching .gitignore files. The resulting + files are staged to be committed, but are not committed. Use + -r/--revision to refer to a specific revision. 'show-ignore':: - Recursively finds and lists the svn:ignore property on - directories. The output is suitable for appending to + Recursively finds and lists the svn:ignore and svn:global-ignores + properties on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file. 'mkdirs':: @@ -871,7 +871,7 @@ Tracking and contributing to the trunk of a Subversion-managed project # Now commit your changes (that were committed previously using Git) to SVN, # as well as automatically updating your working HEAD: git svn dcommit -# Append svn:ignore settings to the default Git exclude file: +# Append svn:ignore and svn:global-ignores settings to the default Git exclude file: git svn show-ignore >> .git/info/exclude ------------------------------------------------------------------------ diff --git a/gittutorial.html b/gittutorial.html index 658ed61c..208d076f 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -903,7 +903,7 @@ She can use three-dot form instead of the two-dot form:

exclude anything that is reachable from both of them".

-

Please note that these range notation can be used with both gitk +

Please note that these range notations can be used with both gitk and git log.

@@ -1314,7 +1314,7 @@ workflows.

diff --git a/gittutorial.txt b/gittutorial.txt index 47594087..f89ad30c 100644 --- a/gittutorial.txt +++ b/gittutorial.txt @@ -360,7 +360,7 @@ $ gitk HEAD...FETCH_HEAD This means "show everything that is reachable from either one, but exclude anything that is reachable from both of them". -Please note that these range notation can be used with both `gitk` +Please note that these range notations can be used with both `gitk` and `git log`. After inspecting what Bob did, if there is nothing urgent, Alice may diff --git a/howto-index.html b/howto-index.html index 1eff5fe7..1d5f6ca6 100644 --- a/howto-index.html +++ b/howto-index.html @@ -442,7 +442,7 @@ pre>code {
@@ -624,7 +624,7 @@ later validate it.

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 0f33143e..2595b413 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 16d28e73..fcbd9713 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -442,7 +442,7 @@ pre>code {
@@ -685,6 +685,13 @@ $ git diff ORIG_HEAD.. ;# final review $ make test ;# final review
+
+
+
If the tip of 'master' is updated, also generate the preformatted
+documentation and push the out result to git-htmldocs and
+git-manpages repositories.
+
+

  • Handle the remaining patches:

    @@ -1235,7 +1242,7 @@ $ git update-ref -d $mf/ai/topic
    • diff --git a/howto/maintain-git.txt b/howto/maintain-git.txt index 41f54050..da31332f 100644 --- a/howto/maintain-git.txt +++ b/howto/maintain-git.txt @@ -181,6 +181,10 @@ by doing the following: $ git diff ORIG_HEAD.. ;# final review $ make test ;# final review + If the tip of 'master' is updated, also generate the preformatted + documentation and push the out result to git-htmldocs and + git-manpages repositories. + - Handle the remaining patches: - Anything unobvious that is applicable to 'master' (in other diff --git a/howto/new-command.html b/howto/new-command.html index 624890fc..d9749ff7 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 f3f17341..0411a136 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 13d35d4e..a4d74717 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 c3dac5fb..35c6548b 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 e9fa9caa..4e0b937b 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 804b5174..e4752dbf 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 e442296d..18ec0768 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 fcd5fda3..70b4f433 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 65d2fe95..b399a829 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 a662a493..a570c1a9 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 038da83f..962480d0 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 6100ace1..16791636 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 d2d9d795..468e2b15 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/technical/api-error-handling.html b/technical/api-error-handling.html index 5c16dae2..a9d0a479 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 bf4702c3..7649fe08 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 d1d05f98..012fd257 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 b97c4786..6a4d1d82 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 abc5b982..eee3c145 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 95c2ffbd..93bd59d9 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 aca94f4d..57b6e5ec 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 ce76a9bb..6e726017 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 8bbecad7..7eb3fb01 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 d8a36c96..6a2ee8d3 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 3b8948c0..e4175092 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 c134899a..fb26c71d 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 25c2335b..781bda41 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 0458f119..a29be7ae 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 945a8dee..2fd99bae 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 19970a91..a7c56bf2 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 3f22112a..4debfac8 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 31444ffe..f84295ba 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 2865a3c2..c55d4be0 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 732f61e4..5f72030c 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 370ba482..1b3fdbd3 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