From 918a697459a240f82a16fba9fe7a606ed1d9c2a9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 30 Oct 2023 08:44:11 +0900 Subject: [PATCH] Autogenerated HTML docs for v2.42.0-526-g3130c1 --- MyFirstContribution.html | 4 ++-- MyFirstObjectWalk.html | 4 ++-- RelNotes/2.43.0.txt | 19 +++++++++++++++++++ ReviewingGuidelines.html | 4 ++-- SubmittingPatches.html | 14 +++++++------- SubmittingPatches.txt | 10 +++++----- ToolsForGit.html | 4 ++-- config.txt | 2 ++ diff-options.txt | 4 ++-- everyday.html | 4 ++-- git-add.html | 2 +- git-am.html | 6 +++--- git-am.txt | 4 ++-- git-annotate.html | 2 +- git-apply.html | 2 +- git-archimport.html | 2 +- git-archive.html | 2 +- git-bisect.html | 2 +- git-blame.html | 2 +- git-branch.html | 4 ++-- git-branch.txt | 2 +- git-bugreport.html | 2 +- git-bundle.html | 2 +- git-cat-file.html | 2 +- git-check-attr.html | 2 +- git-check-ignore.html | 2 +- git-check-mailmap.html | 2 +- git-check-ref-format.html | 2 +- git-checkout-index.html | 2 +- git-checkout.html | 2 +- git-cherry-pick.html | 2 +- git-cherry.html | 2 +- git-citool.html | 2 +- git-clean.html | 2 +- git-clone.html | 2 +- git-column.html | 2 +- git-commit-graph.html | 2 +- git-commit-tree.html | 2 +- git-commit.html | 2 +- git-config.html | 17 +++++++++++++++-- git-count-objects.html | 2 +- git-credential-cache--daemon.html | 2 +- git-credential-cache.html | 2 +- git-credential-store.html | 2 +- git-credential.html | 2 +- git-cvsexportcommit.html | 2 +- git-cvsimport.html | 2 +- git-cvsserver.html | 2 +- git-daemon.html | 2 +- git-describe.html | 2 +- git-diagnose.html | 2 +- git-diff-files.html | 2 +- git-diff-index.html | 2 +- git-diff-tree.html | 2 +- git-diff.html | 2 +- git-difftool.html | 2 +- git-fast-export.html | 2 +- git-fast-import.html | 2 +- git-fetch-pack.html | 2 +- git-fetch.html | 2 +- git-filter-branch.html | 2 +- git-fmt-merge-msg.html | 2 +- git-for-each-ref.html | 2 +- git-for-each-repo.html | 2 +- git-format-patch.html | 2 +- git-fsck-objects.html | 2 +- git-fsck.html | 2 +- git-fsmonitor--daemon.html | 2 +- git-gc.html | 2 +- git-get-tar-commit-id.html | 2 +- git-grep.html | 2 +- git-gui.html | 2 +- git-hash-object.html | 2 +- git-help.html | 2 +- git-hook.html | 2 +- git-http-backend.html | 2 +- git-http-fetch.html | 2 +- git-http-push.html | 2 +- git-imap-send.html | 2 +- git-index-pack.html | 2 +- git-init-db.html | 2 +- git-init.html | 2 +- git-instaweb.html | 2 +- git-interpret-trailers.html | 2 +- git-log.html | 6 +++--- git-ls-files.html | 2 +- git-ls-remote.html | 2 +- git-ls-tree.html | 2 +- git-mailinfo.html | 2 +- git-mailsplit.html | 2 +- git-maintenance.html | 2 +- git-merge-base.html | 2 +- git-merge-file.html | 2 +- git-merge-index.html | 2 +- git-merge-one-file.html | 2 +- git-merge-tree.html | 2 +- git-merge.html | 2 +- git-mergetool--lib.html | 2 +- git-mergetool.html | 2 +- git-mktag.html | 2 +- git-mktree.html | 2 +- git-multi-pack-index.html | 2 +- git-mv.html | 2 +- git-name-rev.html | 2 +- git-notes.html | 2 +- git-p4.html | 2 +- git-pack-objects.html | 2 +- git-pack-redundant.html | 2 +- git-pack-refs.html | 2 +- git-patch-id.html | 2 +- git-prune-packed.html | 2 +- git-prune.html | 2 +- git-pull.html | 2 +- git-push.html | 4 ++-- git-push.txt | 2 +- git-quiltimport.html | 2 +- git-range-diff.html | 4 ++-- git-range-diff.txt | 2 +- git-read-tree.html | 2 +- git-rebase.html | 2 +- git-receive-pack.html | 2 +- git-reflog.html | 2 +- git-remote-ext.html | 2 +- git-remote-fd.html | 2 +- git-remote-helpers.html | 4 ++-- git-remote.html | 2 +- git-repack.html | 11 ++++------- git-repack.txt | 9 +++------ git-replace.html | 2 +- git-request-pull.html | 2 +- git-rerere.html | 2 +- git-reset.html | 2 +- git-restore.html | 2 +- git-rev-list.html | 2 +- git-rev-parse.html | 2 +- git-revert.html | 2 +- git-rm.html | 2 +- git-send-email.html | 13 +++++++------ git-send-email.txt | 11 ++++++----- git-send-pack.html | 2 +- git-sh-i18n--envsubst.html | 2 +- git-sh-i18n.html | 2 +- git-sh-setup.html | 2 +- git-shell.html | 2 +- git-shortlog.html | 2 +- git-show-branch.html | 2 +- git-show-index.html | 2 +- git-show-ref.html | 2 +- git-show.html | 6 +++--- git-sparse-checkout.html | 2 +- git-stage.html | 2 +- git-stash.html | 2 +- git-status.html | 2 +- git-stripspace.html | 2 +- git-submodule.html | 2 +- git-svn.html | 2 +- git-switch.html | 2 +- git-symbolic-ref.html | 2 +- git-tag.html | 2 +- git-unpack-file.html | 2 +- git-unpack-objects.html | 2 +- git-update-index.html | 2 +- git-update-ref.html | 2 +- git-update-server-info.html | 2 +- git-upload-archive.html | 2 +- git-upload-pack.html | 2 +- git-var.html | 2 +- git-verify-commit.html | 2 +- git-verify-pack.html | 2 +- git-verify-tag.html | 2 +- git-version.html | 2 +- git-web--browse.html | 2 +- git-whatchanged.html | 2 +- git-worktree.html | 2 +- git-write-tree.html | 2 +- git.html | 8 ++++---- git.txt | 6 +++--- gitattributes.html | 6 +++--- gitattributes.txt | 4 ++-- gitcli.html | 2 +- gitcore-tutorial.html | 2 +- gitcredentials.html | 2 +- gitcvs-migration.html | 2 +- gitdiffcore.html | 2 +- giteveryday.html | 4 ++-- giteveryday.txt | 2 +- gitfaq.html | 2 +- gitformat-bundle.html | 2 +- gitformat-chunk.html | 2 +- gitformat-commit-graph.html | 2 +- gitformat-index.html | 2 +- gitformat-pack.html | 2 +- gitformat-signature.html | 2 +- gitglossary.html | 2 +- githooks.html | 2 +- gitignore.html | 2 +- gitk.html | 4 ++-- gitk.txt | 2 +- gitmailmap.html | 2 +- gitmodules.html | 2 +- gitnamespaces.html | 2 +- gitprotocol-capabilities.html | 2 +- gitprotocol-common.html | 2 +- gitprotocol-http.html | 2 +- gitprotocol-pack.html | 2 +- gitprotocol-v2.html | 2 +- gitremote-helpers.html | 2 +- gitrepository-layout.html | 2 +- gitrevisions.html | 2 +- gitsubmodules.html | 2 +- gittutorial-2.html | 2 +- gittutorial.html | 2 +- gitweb.conf.html | 2 +- gitweb.html | 2 +- gitworkflows.html | 2 +- howto/coordinate-embargoed-releases.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 ++-- scalar.html | 2 +- technical/api-error-handling.html | 4 ++-- technical/api-index.html | 4 ++-- technical/api-merge.html | 4 ++-- technical/api-parse-options.html | 4 ++-- technical/api-simple-ipc.html | 4 ++-- technical/api-trace2.html | 4 ++-- technical/bitmap-format.html | 4 ++-- technical/bundle-uri.html | 4 ++-- technical/hash-function-transition.html | 4 ++-- technical/long-running-process-protocol.html | 4 ++-- technical/multi-pack-index.html | 4 ++-- technical/pack-heuristics.html | 4 ++-- technical/parallel-checkout.html | 4 ++-- technical/partial-clone.html | 4 ++-- technical/racy-git.html | 4 ++-- technical/reftable.html | 2 +- technical/scalar.html | 4 ++-- technical/send-pack-pipeline.html | 4 ++-- technical/shallow.html | 4 ++-- technical/trivial-merge.html | 4 ++-- user-manual.html | 2 +- 253 files changed, 373 insertions(+), 343 deletions(-) diff --git a/MyFirstContribution.html b/MyFirstContribution.html index edd7dca4..06bbee47 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -2096,7 +2096,7 @@ should generate your diffs from <topic>..<mybranch> and diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index c513f3ce..dd021a1e 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1737,7 +1737,7 @@ Changed the display order of the filtered object walk diff --git a/RelNotes/2.43.0.txt b/RelNotes/2.43.0.txt index a3644aba..ad3b82fe 100644 --- a/RelNotes/2.43.0.txt +++ b/RelNotes/2.43.0.txt @@ -95,6 +95,9 @@ UI, Workflows & Features * "git log" and friends learned "--dd" that is a short-hand for "--diff-merges=first-parent -p". + * The attribute subsystem learned to honor `attr.tree` configuration + that specifies which tree to read the .gitattributes files from. + Performance, Internal Implementation, Development Support etc. @@ -278,6 +281,15 @@ Fixes since v2.42 storing a bogus sd_size value instead for such files. (merge 5143ac07b1 bc/racy-4gb-files later to maint). + * "git p4" tried to store symlinks to LFS when told, but has been + fixed not to do so, because it does not make sense. + (merge 10c89a02b0 mm/p4-symlink-with-lfs later to maint). + + * The codepath to handle recipient addresses `git send-email + --compose` learns from the user was completely broken, which has + been corrected. + (merge 3ec6167567 jk/send-email-fix-addresses-from-composed-messages later to maint). + * Other code cleanup, docfix, build fix, etc. (merge fd3ba590d8 ws/git-push-doc-grammofix later to maint). (merge 5f33a843de ds/upload-pack-error-sequence-fix later to maint). @@ -303,3 +315,10 @@ Fixes since v2.42 (merge badf2fe1c3 jk/decoration-and-other-leak-fixes later to maint). (merge cebfaaa333 sn/cat-file-doc-update later to maint). (merge 8b3aa36f5a ps/rewritten-is-per-worktree-doc later to maint). + (merge ffbf6a748d jc/update-list-references-to-lore later to maint). + (merge 14d569b1a7 jc/am-doc-whitespace-action-fix later to maint). + (merge 48399e9cf0 ni/die-message-fix-for-git-add later to maint). + (merge ca3285dd69 ps/git-repack-doc-fixes later to maint). + (merge 243c79fdc7 wx/merge-ort-comment-typofix later to maint). + (merge a060705d94 jc/commit-new-underscore-index-fix later to maint). + (merge f6d83e2115 ms/doc-push-fix later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 726c955c..8d7f9171 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -975,7 +975,7 @@ message (after the ---) and the beginning of the diff.

diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 8bbe2ecf..2325635e 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1179,8 +1179,8 @@ security relevant should be submitted privately to the Git Security mailing list
[The Git Security mailing list: git-security@googlegroups.com]
, instead of the public mailing list.

Learn to use format-patch and send-email if possible. These commands are optimized for the workflow of sending patches, avoiding many ways -your existing e-mail client that is optimized for "multipart/*" mime -type e-mails to corrupt and render your patches unusable.

+your existing e-mail client (often optimized for "multipart/*" MIME +type e-mails) might render your patches unusable.

People on the Git mailing list need to be able to read and comment on the changes you are submitting. It is important for a developer to be able to "quote" your changes, using standard @@ -1300,8 +1300,8 @@ repositories.

-
Those who are interested in improve gitk can volunteer to help Paul
-in maintaining it cf. <YntxL/fTplFm8lr6@cleo>.
+
Those who are interested in improving gitk can volunteer to help Paul
+maintain it, cf. <YntxL/fTplFm8lr6@cleo>.
  • @@ -1367,7 +1367,7 @@ A topic branch is created with the patch and is merged to next,

    • In any time between the (2)-(3) cycle, the maintainer may pick it up from the list and queue it to seen, in order to make it easier for -people play with it without having to pick up and apply the patch to +people to play with it without having to pick up and apply the patch to their trees themselves.

    @@ -1518,7 +1518,7 @@ this problem around.

    diff --git a/SubmittingPatches.txt b/SubmittingPatches.txt index 0e2d3fbb..965e02e7 100644 --- a/SubmittingPatches.txt +++ b/SubmittingPatches.txt @@ -393,8 +393,8 @@ mailing list{security-ml}, instead of the public mailing list. Learn to use format-patch and send-email if possible. These commands are optimized for the workflow of sending patches, avoiding many ways -your existing e-mail client that is optimized for "multipart/*" mime -type e-mails to corrupt and render your patches unusable. +your existing e-mail client (often optimized for "multipart/*" MIME +type e-mails) might render your patches unusable. People on the Git mailing list need to be able to read and comment on the changes you are submitting. It is important for @@ -515,8 +515,8 @@ repositories. git://git.ozlabs.org/~paulus/gitk - Those who are interested in improve gitk can volunteer to help Paul - in maintaining it cf. . + Those who are interested in improving gitk can volunteer to help Paul + maintain it, cf. . - `po/` comes from the localization coordinator, Jiang Xin: @@ -556,7 +556,7 @@ help you find out who they are. In any time between the (2)-(3) cycle, the maintainer may pick it up from the list and queue it to `seen`, in order to make it easier for -people play with it without having to pick up and apply the patch to +people to play with it without having to pick up and apply the patch to their trees themselves. [[patch-status]] diff --git a/ToolsForGit.html b/ToolsForGit.html index e3812515..9b90eaa0 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -806,7 +806,7 @@ document can be applied here too.

    diff --git a/config.txt b/config.txt index b1dba1ae..e3a74dd1 100644 --- a/config.txt +++ b/config.txt @@ -371,6 +371,8 @@ other popular tools, and describe them in your documentation. include::config/advice.txt[] +include::config/attr.txt[] + include::config/core.txt[] include::config/add.txt[] diff --git a/diff-options.txt b/diff-options.txt index 1a75c28b..53ec3c9a 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -76,7 +76,7 @@ off, none:: + on, m:: Make diff output for merge commits to be shown in the default - format. The default format could be changed using + format. The default format can be changed using `log.diffMerges` configuration variable, whose default value is `separate`. + @@ -314,7 +314,7 @@ ifndef::git-format-patch[] -z:: ifdef::git-log[] - Separate the commits with NULs instead of with new newlines. + Separate the commits with NULs instead of newlines. + Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators. diff --git a/everyday.html b/everyday.html index 15c943fe..e8d584c2 100644 --- a/everyday.html +++ b/everyday.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -751,7 +751,7 @@ link you clicked to get here.

    diff --git a/git-add.html b/git-add.html index 1514e39e..7e41b4ab 100644 --- a/git-add.html +++ b/git-add.html @@ -1425,7 +1425,7 @@ add.interactive.useBuiltin diff --git a/git-am.html b/git-am.html index 6f01b573..c38311c0 100644 --- a/git-am.html +++ b/git-am.html @@ -752,7 +752,7 @@ git-am(1) Manual Page 
    git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
          [--[no-]3way] [--interactive] [--committer-date-is-author-date]
          [--ignore-date] [--ignore-space-change | --ignore-whitespace]
-         [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
+         [--whitespace=<action>] [-C<n>] [-p<n>] [--directory=<dir>]
          [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
          [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
          [--quoted-cr=<action>]
@@ -975,7 +975,7 @@ default.   You can use --no-utf8 to override this.
    --ignore-whitespace
    ---whitespace=<option> +--whitespace=<action>
    -C<n> @@ -1289,7 +1289,7 @@ am.threeWay diff --git a/git-am.txt b/git-am.txt index 0390dab2..e080458d 100644 --- a/git-am.txt +++ b/git-am.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify] [--[no-]3way] [--interactive] [--committer-date-is-author-date] [--ignore-date] [--ignore-space-change | --ignore-whitespace] - [--whitespace=
    diff --git a/git-apply.html b/git-apply.html index cf6d549c..06b9dffe 100644 --- a/git-apply.html +++ b/git-apply.html @@ -1248,7 +1248,7 @@ subdirectory is checked and (if possible) updated.

    diff --git a/git-archimport.html b/git-archimport.html index 48840216..74ae5b09 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -905,7 +905,7 @@ patches that have been traded out-of-sequence between the branches.

    diff --git a/git-archive.html b/git-archive.html index 16a1105f..7ad8d45f 100644 --- a/git-archive.html +++ b/git-archive.html @@ -1159,7 +1159,7 @@ while archiving any tree in your $GIT_DIR/info/attributes file.

    diff --git a/git-bisect.html b/git-bisect.html index a59471ad..3f4514c7 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -1244,7 +1244,7 @@ help or git bisect -h to get a long usage description.

    Last updated - 2023-08-10 09:10:14 PDT + 2023-08-11 01:10:14 JST
    diff --git a/git-blame.html b/git-blame.html index 9c0a73b7..af1e0706 100644 --- a/git-blame.html +++ b/git-blame.html @@ -1498,7 +1498,7 @@ blame.markIgnoredLines diff --git a/git-branch.html b/git-branch.html index f7078549..33c7c65c 100644 --- a/git-branch.html +++ b/git-branch.html @@ -1265,7 +1265,7 @@ superproject’s "origin/main", but tracks the submodule’s "origin/mai multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in git for-each-ref. Sort order defaults to the value configured for the - branch.sort variable if exists, or to sorting based on the + branch.sort variable if it exists, or to sorting based on the full refname (including refs/... prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See git-config(1). @@ -1592,7 +1592,7 @@ a branch?” in the Git User’s Manual.

    diff --git a/git-branch.txt b/git-branch.txt index d207da91..4395aa93 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -324,7 +324,7 @@ superproject's "origin/main", but tracks the submodule's "origin/main". multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the - `branch.sort` variable if exists, or to sorting based on the + `branch.sort` variable if it exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]. diff --git a/git-bugreport.html b/git-bugreport.html index 280115b7..32141e73 100644 --- a/git-bugreport.html +++ b/git-bugreport.html @@ -880,7 +880,7 @@ about their usage.

    diff --git a/git-bundle.html b/git-bundle.html index 2c870b95..696f2b00 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -1104,7 +1104,7 @@ references when fetching:

    diff --git a/git-cat-file.html b/git-cat-file.html index 21057aac..e6bf311b 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -1342,7 +1342,7 @@ will be reported.

    diff --git a/git-check-attr.html b/git-check-attr.html index be89417e..04b98992 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -970,7 +970,7 @@ README: caveat: unspecified diff --git a/git-check-ignore.html b/git-check-ignore.html index 344c29e0..4d72e6dc 100644 --- a/git-check-ignore.html +++ b/git-check-ignore.html @@ -924,7 +924,7 @@ buffer.

    diff --git a/git-check-mailmap.html b/git-check-mailmap.html index 421cbf80..a45a0bf9 100644 --- a/git-check-mailmap.html +++ b/git-check-mailmap.html @@ -811,7 +811,7 @@ to specify a custom .mailmap target file or object.

    diff --git a/git-check-ref-format.html b/git-check-ref-format.html index abcf6ef6..6c92aff0 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -963,7 +963,7 @@ Determine the reference name to use for a new branch: diff --git a/git-checkout-index.html b/git-checkout-index.html index c4c0fd27..313fc64e 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -1020,7 +1020,7 @@ into the file .merged-Makefile.

    diff --git a/git-checkout.html b/git-checkout.html index d9e0cf9b..c9d94da2 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -1633,7 +1633,7 @@ checkout.thresholdForParallelism diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 353bbfb4..3b421e89 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -1217,7 +1217,7 @@ try to apply the change introduced by topic^ again, diff --git a/git-cherry.html b/git-cherry.html index 2f566514..6f997f85 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -915,7 +915,7 @@ between base and topic:

    diff --git a/git-citool.html b/git-citool.html index c7530ab1..2769f780 100644 --- a/git-citool.html +++ b/git-citool.html @@ -776,7 +776,7 @@ See git-gui(1) for more details.

    diff --git a/git-clean.html b/git-clean.html index 0e947da7..504cfc66 100644 --- a/git-clean.html +++ b/git-clean.html @@ -992,7 +992,7 @@ clean.requireForce diff --git a/git-clone.html b/git-clone.html index 39b3f6c9..67194bc8 100644 --- a/git-clone.html +++ b/git-clone.html @@ -1513,7 +1513,7 @@ clone.filterSubmodules diff --git a/git-column.html b/git-column.html index bf89dcc5..812bc8d2 100644 --- a/git-column.html +++ b/git-column.html @@ -1015,7 +1015,7 @@ column.tag diff --git a/git-commit-graph.html b/git-commit-graph.html index c7e3188b..a76d53e7 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html @@ -989,7 +989,7 @@ commitGraph.readChangedPaths diff --git a/git-commit-tree.html b/git-commit-tree.html index 39a88be8..e88f69a9 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -1029,7 +1029,7 @@ reversible operation.

    diff --git a/git-commit.html b/git-commit.html index 539622ff..e60c1606 100644 --- a/git-commit.html +++ b/git-commit.html @@ -1840,7 +1840,7 @@ information.

    diff --git a/git-config.html b/git-config.html index aaa4e804..217b7808 100644 --- a/git-config.html +++ b/git-config.html @@ -2342,6 +2342,19 @@ worktreeAddOrphan
    +attr.tree +
    +
    +

    + A reference to a tree in the repository from which to read attributes, + instead of the .gitattributes file in the working tree. In a bare + repository, this defaults to HEAD:.gitattributes. If the value does + not resolve to a valid tree object, an empty tree is used instead. + When the GIT_ATTR_SOURCE environment variable or --attr-source + command line option are used, this configuration variable has no effect. +

    +
    +
    core.fileMode
    @@ -11335,7 +11348,7 @@ Even if it does, having such data stored "at rest" might expose you

    The git programs will pass the full URL to one another as arguments on the command-line, meaning the credentials will be exposed to other - users on OS’s or systems that allow other users to see the full + unprivileged users on systems that allow them to see the full process list of other users. On linux the "hidepid" setting documented in procfs(5) allows for configuring this behavior.

    @@ -11832,7 +11845,7 @@ looks like

    diff --git a/git-count-objects.html b/git-count-objects.html index d54a5c89..5cd64553 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -815,7 +815,7 @@ Print sizes in human readable format diff --git a/git-credential-cache--daemon.html b/git-credential-cache--daemon.html index 0b7a8741..35672fcd 100644 --- a/git-credential-cache--daemon.html +++ b/git-credential-cache--daemon.html @@ -786,7 +786,7 @@ begun listening for clients.

    diff --git a/git-credential-cache.html b/git-credential-cache.html index bfe10c97..0ef9e6c7 100644 --- a/git-credential-cache.html +++ b/git-credential-cache.html @@ -845,7 +845,7 @@ variable (this example increases the cache time to 1 hour):

    diff --git a/git-credential-store.html b/git-credential-store.html index c64a1ae5..8b01eacd 100644 --- a/git-credential-store.html +++ b/git-credential-store.html @@ -882,7 +882,7 @@ for more information.

    diff --git a/git-credential.html b/git-credential.html index ce596fc6..614f6b01 100644 --- a/git-credential.html +++ b/git-credential.html @@ -986,7 +986,7 @@ to pass additional information to credential helpers.

    diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 71f74287..5f223650 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -951,7 +951,7 @@ $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit diff --git a/git-cvsimport.html b/git-cvsimport.html index af3a9cae..83ecbbe0 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -1107,7 +1107,7 @@ cvs2git (part of cvs2svn), http://subversion.apache.org/ diff --git a/git-cvsserver.html b/git-cvsserver.html index a9f96a95..a675dc4c 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -1327,7 +1327,7 @@ and gitcvs.allBinary to "guess".

    diff --git a/git-daemon.html b/git-daemon.html index 5e2fa7ad..f30e5b9f 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -1281,7 +1281,7 @@ services are performed.

    diff --git a/git-describe.html b/git-describe.html index 43efd6c8..144f232a 100644 --- a/git-describe.html +++ b/git-describe.html @@ -1042,7 +1042,7 @@ tag being favorable.

    diff --git a/git-diagnose.html b/git-diagnose.html index 4fc83881..505b40e4 100644 --- a/git-diagnose.html +++ b/git-diagnose.html @@ -858,7 +858,7 @@ Users should exercise caution when sharing an archive generated with diff --git a/git-diff-files.html b/git-diff-files.html index 2c512cf7..9077941f 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -2716,7 +2716,7 @@ the pathname, but if that is NUL, the record will show two paths.
    Last updated - 2023-10-23 14:43:46 PDT + 2023-10-24 06:43:46 JST
    diff --git a/git-diff-index.html b/git-diff-index.html index 238db47c..68865ed7 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -2810,7 +2810,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 54ca361f..1fed50f8 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -4044,7 +4044,7 @@ the pathname, but if that is NUL, the record will show two paths.
    Last updated - 2023-10-23 14:43:46 PDT + 2023-10-24 06:43:46 JST
    diff --git a/git-diff.html b/git-diff.html index 34f703e5..e81d8a1f 100644 --- a/git-diff.html +++ b/git-diff.html @@ -3679,7 +3679,7 @@ diff.colorMovedWS diff --git a/git-difftool.html b/git-difftool.html index 62858e6a..d55bfc48 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -1055,7 +1055,7 @@ difftool.guiDefault diff --git a/git-fast-export.html b/git-fast-export.html index fa7da217..5de4830b 100644 --- a/git-fast-export.html +++ b/git-fast-export.html @@ -1120,7 +1120,7 @@ a tag referencing a tree instead of a commit.

    diff --git a/git-fast-import.html b/git-fast-import.html index a7047a37..ee86b99c 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -2640,7 +2640,7 @@ fastimport.unpackLimit diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 95a4f984..ae0cb506 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -983,7 +983,7 @@ they may alternatively be 40-hex sha1s present on the remote.

    diff --git a/git-fetch.html b/git-fetch.html index 1fdd6118..18406e8f 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -2237,7 +2237,7 @@ submodule update. This is expected to be fixed in a future Git version.
    Last updated - 2023-05-15 16:02:03 PDT + 2023-05-16 08:02:03 JST
    diff --git a/git-filter-branch.html b/git-filter-branch.html index 73d68b57..bb44565f 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -1626,7 +1626,7 @@ To top it all off, even when users finally find working commands, diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 6966f1e8..448dc1fe 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -917,7 +917,7 @@ the "origin" remote.

    diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 704ff562..6798e112 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -1498,7 +1498,7 @@ commits and from none of the --no-merged commits are shown.

    Last updated - 2023-10-04 15:43:56 PDT + 2023-10-05 07:43:56 JST
    diff --git a/git-for-each-repo.html b/git-for-each-repo.html index 1b269897..4ee70593 100644 --- a/git-for-each-repo.html +++ b/git-for-each-repo.html @@ -812,7 +812,7 @@ descriptors stdin, stdout, and stderr.

    Last updated - 2020-11-20 22:32:32 PST + 2020-11-21 15:32:32 JST
    diff --git a/git-format-patch.html b/git-format-patch.html index d2e154ad..01b19426 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -2618,7 +2618,7 @@ merge commit.

    diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 66181764..61b56b38 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -772,7 +772,7 @@ documentation of that command.

    diff --git a/git-fsck.html b/git-fsck.html index 148c3b9c..a7999a74 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -1591,7 +1591,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-fsmonitor--daemon.html b/git-fsmonitor--daemon.html index d04cb8e6..7976b262 100644 --- a/git-fsmonitor--daemon.html +++ b/git-fsmonitor--daemon.html @@ -900,7 +900,7 @@ fsmonitor.socketDir diff --git a/git-gc.html b/git-gc.html index cc259c1f..c22b1447 100644 --- a/git-gc.html +++ b/git-gc.html @@ -1257,7 +1257,7 @@ seems to be low in practice).

    diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index fe994802..c79954be 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -778,7 +778,7 @@ a tree ID instead of a commit ID or tag.

    diff --git a/git-grep.html b/git-grep.html index 7ab380ca..ee052fc0 100644 --- a/git-grep.html +++ b/git-grep.html @@ -1489,7 +1489,7 @@ grep.fallbackToNoIndex diff --git a/git-gui.html b/git-gui.html index d297f883..fbaad636 100644 --- a/git-gui.html +++ b/git-gui.html @@ -945,7 +945,7 @@ of end users.

    diff --git a/git-hash-object.html b/git-hash-object.html index b5580456..c5edeb14 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -855,7 +855,7 @@ When <type> is not specified, it defaults to "blob".

    diff --git a/git-help.html b/git-help.html index 1fd38ca0..d2102ac1 100644 --- a/git-help.html +++ b/git-help.html @@ -1056,7 +1056,7 @@ See git-config(1) for more information about this. diff --git a/git-hook.html b/git-hook.html index 5068e5a8..dae55250 100644 --- a/git-hook.html +++ b/git-hook.html @@ -824,7 +824,7 @@ mandatory -- (or --end-of-options, see
    Last updated - 2023-10-23 14:43:46 PDT + 2023-10-24 06:43:46 JST
    diff --git a/git-http-backend.html b/git-http-backend.html index a0fb2b86..f020c8da 100644 --- a/git-http-backend.html +++ b/git-http-backend.html @@ -1102,7 +1102,7 @@ invoked by the git-receive-pack.

    diff --git a/git-http-fetch.html b/git-http-fetch.html index 0ab1d00f..27331802 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -860,7 +860,7 @@ commit-id diff --git a/git-http-push.html b/git-http-push.html index cf2c8556..2e1f9f7d 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -908,7 +908,7 @@ to disable the fast-forward check only on that ref.

    diff --git a/git-imap-send.html b/git-imap-send.html index 959a11ec..6611ce20 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -1028,7 +1028,7 @@ users may wish to visit this web page for more information: diff --git a/git-index-pack.html b/git-index-pack.html index 5555f40f..2488ac73 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -985,7 +985,7 @@ mentioned above.

    diff --git a/git-init-db.html b/git-init-db.html index 407cb078..a9ff2fc0 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -772,7 +772,7 @@ documentation of that command.

    diff --git a/git-init.html b/git-init.html index 976b0805..e98713a3 100644 --- a/git-init.html +++ b/git-init.html @@ -1038,7 +1038,7 @@ init.defaultBranch diff --git a/git-instaweb.html b/git-instaweb.html index 23f6e050..f0e88934 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -907,7 +907,7 @@ restart diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html index 32ee9a6d..4b3fce64 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html @@ -1393,7 +1393,7 @@ $ chmod +x .git/hooks/commit-msg diff --git a/git-log.html b/git-log.html index 179aaa38..7c438793 100644 --- a/git-log.html +++ b/git-log.html @@ -3654,7 +3654,7 @@ on, m

    Make diff output for merge commits to be shown in the default - format. The default format could be changed using + format. The default format can be changed using log.diffMerges configuration variable, whose default value is separate.

    @@ -4077,7 +4077,7 @@ and accumulating child directory counts in the parent directories:

    - Separate the commits with NULs instead of with new newlines. + Separate the commits with NULs instead of newlines.

    Also, when --raw or --numstat has been given, do not munge pathnames and use NULs as output field terminators.

    @@ -5666,7 +5666,7 @@ See notes.rewrite.<command> above for a further description o diff --git a/git-ls-files.html b/git-ls-files.html index 8c908bc5..9eeb4990 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -1382,7 +1382,7 @@ pattern file appears in.

    diff --git a/git-ls-remote.html b/git-ls-remote.html index 90781ddd..3391bd96 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -987,7 +987,7 @@ d4ca2e3147b409459955613c152220f4db848ee1 refs/tags/v2.40.0 diff --git a/git-ls-tree.html b/git-ls-tree.html index e20b965a..5d831860 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -1028,7 +1028,7 @@ path diff --git a/git-mailinfo.html b/git-mailinfo.html index 749f046f..78995ecd 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -972,7 +972,7 @@ mailinfo.scissors diff --git a/git-mailsplit.html b/git-mailsplit.html index 5f1c2dba..939aaef0 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -860,7 +860,7 @@ patches in the correct order. diff --git a/git-maintenance.html b/git-maintenance.html index 5f081678..dfe43f1e 100644 --- a/git-maintenance.html +++ b/git-maintenance.html @@ -1359,7 +1359,7 @@ maintenance.incremental-repack.auto diff --git a/git-merge-base.html b/git-merge-base.html index e86337ef..e2a1dc39 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -1017,7 +1017,7 @@ commits that used to be at the tip of origin/master).

    diff --git a/git-merge-file.html b/git-merge-file.html index f4e82826..9880a987 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -894,7 +894,7 @@ implements all of RCS merge's functionality which is needed by diff --git a/git-merge-index.html b/git-merge-index.html index 2cedbc82..d4128b43 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -852,7 +852,7 @@ for the AA file, because it didn’t exist in the original, and thus diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 1c961f49..907a4010 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -772,7 +772,7 @@ to resolve a merge after the trivial merge done with git read-tree -m.< diff --git a/git-merge-tree.html b/git-merge-tree.html index a429f6ae..b46a7630 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -1152,7 +1152,7 @@ large repositories).

    diff --git a/git-merge.html b/git-merge.html index d5dda7ff..f4d79c05 100644 --- a/git-merge.html +++ b/git-merge.html @@ -2336,7 +2336,7 @@ merge.<driver>.recursive diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 6f4780f8..7f04aab6 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html @@ -832,7 +832,7 @@ run_merge_tool diff --git a/git-mergetool.html b/git-mergetool.html index 8c8886e5..b1cffd26 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -1342,7 +1342,7 @@ MERGED and REMOTE).

    diff --git a/git-mktag.html b/git-mktag.html index 037c05c8..2767aa6d 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -828,7 +828,7 @@ care about, but that can be verified with gpg.

    diff --git a/git-mktree.html b/git-mktree.html index 1bb98f72..2aa6e048 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -811,7 +811,7 @@ built is written to the standard output.

    diff --git a/git-multi-pack-index.html b/git-multi-pack-index.html index db7631bb..8e0a906d 100644 --- a/git-multi-pack-index.html +++ b/git-multi-pack-index.html @@ -958,7 +958,7 @@ multi-pack-index feature and its file format.

    diff --git a/git-mv.html b/git-mv.html index e928ca73..ced14c8b 100644 --- a/git-mv.html +++ b/git-mv.html @@ -857,7 +857,7 @@ been implemented.

    diff --git a/git-name-rev.html b/git-name-rev.html index 74e35afa..9f83873a 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -903,7 +903,7 @@ not the context.

    diff --git a/git-notes.html b/git-notes.html index 849ec4c7..689a7b6f 100644 --- a/git-notes.html +++ b/git-notes.html @@ -1396,7 +1396,7 @@ on the notes.rewrite.<command> and notes.rewriteRef
    Last updated - 2023-08-17 17:18:11 PDT + 2023-08-18 09:18:11 JST
    diff --git a/git-p4.html b/git-p4.html index ed16cfbd..ee0d4df6 100644 --- a/git-p4.html +++ b/git-p4.html @@ -1974,7 +1974,7 @@ Each commit imported by git p4 has a line at the end of the log diff --git a/git-pack-objects.html b/git-pack-objects.html index f5cc212f..5b737819 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -1388,7 +1388,7 @@ attribute delta set to false.

    diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 92bfb27b..e0002ac5 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -834,7 +834,7 @@ git pack-redundant --all | xargs rm

    diff --git a/git-pack-refs.html b/git-pack-refs.html index 851b6de2..d403b921 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -860,7 +860,7 @@ exists" when it means "branch <branch> exists".

    diff --git a/git-patch-id.html b/git-patch-id.html index 2ce031a5..47b00891 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -855,7 +855,7 @@ All whitespace within the patch is ignored and does not affect the id. diff --git a/git-prune-packed.html b/git-prune-packed.html index 3726c82d..eca33d4b 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -814,7 +814,7 @@ disk storage, etc.

    diff --git a/git-prune.html b/git-prune.html index cdc99c62..81142d2c 100644 --- a/git-prune.html +++ b/git-prune.html @@ -884,7 +884,7 @@ many other housekeeping tasks.

    diff --git a/git-pull.html b/git-pull.html index c32ec00f..5e8b36c7 100644 --- a/git-pull.html +++ b/git-pull.html @@ -2314,7 +2314,7 @@ version.

    diff --git a/git-push.html b/git-push.html index 69061302..fa0be5f0 100644 --- a/git-push.html +++ b/git-push.html @@ -750,7 +750,7 @@ git-push(1) Manual Page 
    git push [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
-           [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
+           [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-q | --quiet] [-v | --verbose]
            [-u | --set-upstream] [-o <string> | --push-option=<string>]
            [--[no-]signed|--signed=(true|false|if-asked)]
            [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
@@ -2181,7 +2181,7 @@ push.useBitmaps
 
 
diff --git a/git-push.txt b/git-push.txt
index c12caedb..9b7cfbc5 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git push' [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=]
-	   [--repo=] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
+	   [--repo=] [-f | --force] [-d | --delete] [--prune] [-q | --quiet] [-v | --verbose]
 	   [-u | --set-upstream] [-o  | --push-option=]
 	   [--[no-]signed|--signed=(true|false|if-asked)]
 	   [--force-with-lease[=[:]] [--force-if-includes]]
diff --git a/git-quiltimport.html b/git-quiltimport.html
index ea022dc5..0b629e6f 100644
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -841,7 +841,7 @@ variable.
    diff --git a/git-range-diff.html b/git-range-diff.html index fd1fa99d..2a75d031 100644 --- a/git-range-diff.html +++ b/git-range-diff.html @@ -958,7 +958,7 @@ introduced by the rebase directly afterwards using:

    In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the -commit message of the 2nd commit as well its diff.

    +commit message of the 2nd commit as well as its diff.

    When the output goes to a terminal, it is color-coded by default, just like regular git diff's output. In addition, the first line (adding a commit) is green, the last line (deleting a commit) is red, the second @@ -1085,7 +1085,7 @@ found in this case will look like this:

    diff --git a/git-range-diff.txt b/git-range-diff.txt index 605a92e2..fbdbe0be 100644 --- a/git-range-diff.txt +++ b/git-range-diff.txt @@ -166,7 +166,7 @@ A typical output of `git range-diff` would look like this: In this example, there are 3 old and 3 new commits, where the developer removed the 3rd, added a new one before the first two, and modified the -commit message of the 2nd commit as well its diff. +commit message of the 2nd commit as well as its diff. When the output goes to a terminal, it is color-coded by default, just like regular `git diff`'s output. In addition, the first line (adding a diff --git a/git-read-tree.html b/git-read-tree.html index 1968d7e8..1bbe705c 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -1294,7 +1294,7 @@ support.

    diff --git a/git-rebase.html b/git-rebase.html index a2673f10..93dbedc4 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -2803,7 +2803,7 @@ sequence.editor diff --git a/git-receive-pack.html b/git-receive-pack.html index 25bc415f..69620116 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -1094,7 +1094,7 @@ The pre-receive hook MUST NOT update any refs to point to diff --git a/git-reflog.html b/git-reflog.html index a6265b23..82cafdf9 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -925,7 +925,7 @@ used with expire.

    diff --git a/git-remote-ext.html b/git-remote-ext.html index 7c6850d4..ad6862a7 100644 --- a/git-remote-ext.html +++ b/git-remote-ext.html @@ -963,7 +963,7 @@ begins with ext::. Examples:

    diff --git a/git-remote-fd.html b/git-remote-fd.html index 3bfe8eca..e95aa67f 100644 --- a/git-remote-fd.html +++ b/git-remote-fd.html @@ -843,7 +843,7 @@ GIT_TRANSLOOP_DEBUG diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 5ab796bf..f691df1c 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -751,7 +751,7 @@ link you clicked to get here.

    diff --git a/git-remote.html b/git-remote.html index 9f04749f..dc22f9c8 100644 --- a/git-remote.html +++ b/git-remote.html @@ -1057,7 +1057,7 @@ $ git merge origin     diff --git a/git-repack.html b/git-repack.html index 129e1e97..6f3f08ba 100644 --- a/git-repack.html +++ b/git-repack.html @@ -1091,7 +1091,7 @@ depth is 4095.

    --g=<factor> +-g<factor>
    --geometric=<factor> @@ -1111,11 +1111,8 @@ intact.

    uniquely by the set of packs being "rolled-up"; in other words, the packs determined to need to be combined in order to restore a geometric progression.

    -

    When --unpacked is specified, loose objects are implicitly included in -this "roll-up", without respect to their reachability. This is subject -to change in the future. This option (implying a drastically different -repack mode) is not guaranteed to work with all other combinations of -options to git repack.

    +

    Loose objects are implicitly included in this "roll-up", without respect to +their reachability. This is subject to change in the future.

    When writing a multi-pack bitmap, git repack selects the largest resulting pack as the preferred pack for object selection by the MIDX (see git-multi-pack-index(1)).

    @@ -1172,7 +1169,7 @@ attribute delta set to false.

    diff --git a/git-repack.txt b/git-repack.txt index c3383290..c902512a 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -220,7 +220,7 @@ depth is 4095. Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]. --g=:: +-g:: --geometric=:: Arrange resulting pack structure so that each successive pack contains at least `` times the number of objects as the @@ -237,11 +237,8 @@ uniquely by the set of packs being "rolled-up"; in other words, the packs determined to need to be combined in order to restore a geometric progression. + -When `--unpacked` is specified, loose objects are implicitly included in -this "roll-up", without respect to their reachability. This is subject -to change in the future. This option (implying a drastically different -repack mode) is not guaranteed to work with all other combinations of -options to `git repack`. +Loose objects are implicitly included in this "roll-up", without respect to +their reachability. This is subject to change in the future. + When writing a multi-pack bitmap, `git repack` selects the largest resulting pack as the preferred pack for object selection by the MIDX (see diff --git a/git-replace.html b/git-replace.html index a61a6262..e4a53890 100644 --- a/git-replace.html +++ b/git-replace.html @@ -971,7 +971,7 @@ pending objects.

    diff --git a/git-request-pull.html b/git-request-pull.html index 058ee0c8..7b116a7f 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -855,7 +855,7 @@ the one you have locally, e.g.

    diff --git a/git-rerere.html b/git-rerere.html index 33551583..bd49b471 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -990,7 +990,7 @@ setting in gitattributes(5) can be used.

    Last updated - 2022-10-28 11:53:56 PDT + 2022-10-29 03:53:56 JST
    diff --git a/git-reset.html b/git-reset.html index 0dfcc353..fb99c427 100644 --- a/git-reset.html +++ b/git-reset.html @@ -1507,7 +1507,7 @@ entries:

    diff --git a/git-restore.html b/git-restore.html index 04efbff6..b9ef32fe 100644 --- a/git-restore.html +++ b/git-restore.html @@ -1077,7 +1077,7 @@ as using git-checkout(1))

    diff --git a/git-rev-list.html b/git-rev-list.html index 6d5a9536..51789a41 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -3770,7 +3770,7 @@ Compare the on-disk size of branches in one group of refs, excluding diff --git a/git-rev-parse.html b/git-rev-parse.html index 01238dcc..6aca7167 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -2151,7 +2151,7 @@ Similar to above: diff --git a/git-revert.html b/git-revert.html index ad8b3d8d..842cfa28 100644 --- a/git-revert.html +++ b/git-revert.html @@ -1070,7 +1070,7 @@ revert.reference diff --git a/git-rm.html b/git-rm.html index ac15f874..6b07f868 100644 --- a/git-rm.html +++ b/git-rm.html @@ -1033,7 +1033,7 @@ obsolete when recursive submodule update has been implemented.

    diff --git a/git-send-email.html b/git-send-email.html index 5abdf0c8..05ab8cc5 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -832,11 +832,12 @@ and the "Subject:" of the message as the second line.

    Invoke a text editor (see GIT_EDITOR in git-var(1)) to edit an introductory message for the patch series.

    -

    When --compose is used, git send-email will use the From, Subject, and -In-Reply-To headers specified in the message. If the body of the message -(what you type after the headers and a blank line) only contains blank -(or Git: prefixed) lines, the summary won’t be sent, but From, Subject, -and In-Reply-To headers will be used unless they are removed.

    +

    When --compose is used, git send-email will use the From, To, Cc, Bcc, +Subject, Reply-To, and In-Reply-To headers specified in the message. If +the body of the message (what you type after the headers and a blank +line) only contains blank (or Git: prefixed) lines, the summary won’t be +sent, but the headers mentioned above will be used unless they are +removed.

    Missing From or In-Reply-To headers will be prompted for.

    See the CONFIGURATION section for sendemail.multiEdit.

    @@ -1833,7 +1834,7 @@ Authen::SASL and Mail::Address.

    diff --git a/git-send-email.txt b/git-send-email.txt index e90d0418..465011ba 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -68,11 +68,12 @@ This option may be specified multiple times. Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1]) to edit an introductory message for the patch series. + -When `--compose` is used, git send-email will use the From, Subject, and -In-Reply-To headers specified in the message. If the body of the message -(what you type after the headers and a blank line) only contains blank -(or Git: prefixed) lines, the summary won't be sent, but From, Subject, -and In-Reply-To headers will be used unless they are removed. +When `--compose` is used, git send-email will use the From, To, Cc, Bcc, +Subject, Reply-To, and In-Reply-To headers specified in the message. If +the body of the message (what you type after the headers and a blank +line) only contains blank (or Git: prefixed) lines, the summary won't be +sent, but the headers mentioned above will be used unless they are +removed. + Missing From or In-Reply-To headers will be prompted for. + diff --git a/git-send-pack.html b/git-send-pack.html index 7fe9e63d..e220938b 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -994,7 +994,7 @@ to disable the fast-forward check only on that ref.

    diff --git a/git-sh-i18n--envsubst.html b/git-sh-i18n--envsubst.html index 1aefa501..a5b9dc09 100644 --- a/git-sh-i18n--envsubst.html +++ b/git-sh-i18n--envsubst.html @@ -785,7 +785,7 @@ of Git. Don’t use it.

    diff --git a/git-sh-i18n.html b/git-sh-i18n.html index b66da6e9..80a63de3 100644 --- a/git-sh-i18n.html +++ b/git-sh-i18n.html @@ -807,7 +807,7 @@ eval_gettext diff --git a/git-sh-setup.html b/git-sh-setup.html index 5ebb9ea7..4d5cb1d7 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -902,7 +902,7 @@ create_virtual_base diff --git a/git-shell.html b/git-shell.html index 8f46133c..675ea2d8 100644 --- a/git-shell.html +++ b/git-shell.html @@ -873,7 +873,7 @@ contrib/git-shell-commands/README

    diff --git a/git-shortlog.html b/git-shortlog.html index d3d2b142..1ac89a3a 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -2037,7 +2037,7 @@ the current directory.

    diff --git a/git-show-branch.html b/git-show-branch.html index d25943de..a9fdaaed 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -1065,7 +1065,7 @@ showBranch.default diff --git a/git-show-index.html b/git-show-index.html index 4e2a48cd..6e2f2fc7 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -826,7 +826,7 @@ without data loss.

    diff --git a/git-show-ref.html b/git-show-ref.html index 52b6a663..821b2e20 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -987,7 +987,7 @@ flag, so you can do

    diff --git a/git-show.html b/git-show.html index 16cf6407..80b3fd1a 100644 --- a/git-show.html +++ b/git-show.html @@ -2109,7 +2109,7 @@ on, m

    Make diff output for merge commits to be shown in the default - format. The default format could be changed using + format. The default format can be changed using log.diffMerges configuration variable, whose default value is separate.

    @@ -2532,7 +2532,7 @@ and accumulating child directory counts in the parent directories:

    - Separate the commits with NULs instead of with new newlines. + Separate the commits with NULs instead of newlines.

    Also, when --raw or --numstat has been given, do not munge pathnames and use NULs as output field terminators.

    @@ -3829,7 +3829,7 @@ reversible operation.

    diff --git a/git-sparse-checkout.html b/git-sparse-checkout.html index 56f600cc..d8e1c576 100644 --- a/git-sparse-checkout.html +++ b/git-sparse-checkout.html @@ -1312,7 +1312,7 @@ of these restrictions.

    diff --git a/git-stage.html b/git-stage.html index 204ae39d..e401cd67 100644 --- a/git-stage.html +++ b/git-stage.html @@ -772,7 +772,7 @@ documentation of that command.

    diff --git a/git-stash.html b/git-stash.html index 226e7ac6..bd4c5384 100644 --- a/git-stash.html +++ b/git-stash.html @@ -1327,7 +1327,7 @@ stash.showStat diff --git a/git-status.html b/git-status.html index 829aa59e..eec1c149 100644 --- a/git-status.html +++ b/git-status.html @@ -1464,7 +1464,7 @@ normal.

    diff --git a/git-stripspace.html b/git-stripspace.html index 5a54c830..1d2eedc2 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -876,7 +876,7 @@ the repository.

    diff --git a/git-submodule.html b/git-submodule.html index 5ca592e0..460a2045 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -1416,7 +1416,7 @@ for details.

    diff --git a/git-svn.html b/git-svn.html index 26baae2b..b52b294c 100644 --- a/git-svn.html +++ b/git-svn.html @@ -2514,7 +2514,7 @@ and imports all SVN tags as branches, prefixing the tag name with tags/ diff --git a/git-switch.html b/git-switch.html index 1f9277ff..94213c66 100644 --- a/git-switch.html +++ b/git-switch.html @@ -1199,7 +1199,7 @@ checkout.thresholdForParallelism diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 0e255878..a0aae080 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -863,7 +863,7 @@ name is not a symbolic ref, or 128 if another error occurs.

    diff --git a/git-tag.html b/git-tag.html index 59571e6c..7e260c50 100644 --- a/git-tag.html +++ b/git-tag.html @@ -1367,7 +1367,7 @@ commits and from none of the --no-merged commits are shown.

    Last updated - 2023-06-13 13:57:42 PDT + 2023-06-14 05:57:42 JST
    diff --git a/git-unpack-file.html b/git-unpack-file.html index 4e058a94..601312ad 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html @@ -788,7 +788,7 @@ returns the name of the temporary file in the following format: diff --git a/git-unpack-objects.html b/git-unpack-objects.html index da0e9a99..c96452ff 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -830,7 +830,7 @@ new packs and replace existing ones.

    diff --git a/git-update-index.html b/git-update-index.html index 07d2ca98..7f04846d 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -1557,7 +1557,7 @@ automatically.

    diff --git a/git-update-ref.html b/git-update-ref.html index 6a2c094e..861fbc65 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -974,7 +974,7 @@ or does not have committer information available.

    diff --git a/git-update-server-info.html b/git-update-server-info.html index b3675ccf..d1ba9538 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -813,7 +813,7 @@ info/refs diff --git a/git-upload-archive.html b/git-upload-archive.html index c60273b0..7240ffbf 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -832,7 +832,7 @@ access via non-smart-http.

    diff --git a/git-upload-pack.html b/git-upload-pack.html index 9a9a7040..b421c6f1 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -854,7 +854,7 @@ repository. For push operations, see git send-pack.

    diff --git a/git-var.html b/git-var.html index 4d49b2ac..13964d13 100644 --- a/git-var.html +++ b/git-var.html @@ -924,7 +924,7 @@ disabled by other environment variables.

    diff --git a/git-verify-commit.html b/git-verify-commit.html index 5d96af43..6f5ace1b 100644 --- a/git-verify-commit.html +++ b/git-verify-commit.html @@ -806,7 +806,7 @@ git-verify-commit(1) Manual Page diff --git a/git-verify-pack.html b/git-verify-pack.html index 3230d9f7..2ef00f89 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -836,7 +836,7 @@ corresponding pack file.

    diff --git a/git-verify-tag.html b/git-verify-tag.html index 3e1786e1..c7985cc3 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -806,7 +806,7 @@ git-verify-tag(1) Manual Page diff --git a/git-version.html b/git-version.html index 689a0e37..f0cd9955 100644 --- a/git-version.html +++ b/git-version.html @@ -789,7 +789,7 @@ former is internally converted into the latter.

    diff --git a/git-web--browse.html b/git-web--browse.html index 60e675aa..35c3a915 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -964,7 +964,7 @@ See git-config(1) for more information about this. diff --git a/git-whatchanged.html b/git-whatchanged.html index e1280a31..6a681b5b 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -803,7 +803,7 @@ reading the Linux kernel mailing list are trained to type it.

    diff --git a/git-worktree.html b/git-worktree.html index 8eb6c94b..0f02f593 100644 --- a/git-worktree.html +++ b/git-worktree.html @@ -1399,7 +1399,7 @@ checkouts of a superproject.

    diff --git a/git-write-tree.html b/git-write-tree.html index 49ed13fc..cd1d4499 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -805,7 +805,7 @@ now, you need to have done a git update-index phase before you did the diff --git a/git.html b/git.html index 6979a100..c5ab9c4e 100644 --- a/git.html +++ b/git.html @@ -865,9 +865,9 @@ foo.bar= ...) sets foo.bar to the empty string which g to avoid ambiguity with <name> containing one.

    This is useful for cases where you want to pass transitory -configuration options to git, but are doing so on OS’s where -other processes might be able to read your cmdline -(e.g. /proc/self/cmdline), but not your environ +configuration options to git, but are doing so on operating systems +where other processes might be able to read your command line +(e.g. /proc/self/cmdline), but not your environment (e.g. /proc/self/environ). That behavior is the default on Linux, but may not be on your system.

    Note that this might add security for variables such as @@ -3814,7 +3814,7 @@ the Git Security mailing list <

    Last updated - 2023-08-07 14:08:40 PDT + 2023-10-30 08:42:00 JST
    diff --git a/git.txt b/git.txt index 11228956..9aeabde2 100644 --- a/git.txt +++ b/git.txt @@ -96,9 +96,9 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config to avoid ambiguity with `` containing one. + This is useful for cases where you want to pass transitory -configuration options to git, but are doing so on OS's where -other processes might be able to read your cmdline -(e.g. `/proc/self/cmdline`), but not your environ +configuration options to git, but are doing so on operating systems +where other processes might be able to read your command line +(e.g. `/proc/self/cmdline`), but not your environment (e.g. `/proc/self/environ`). That behavior is the default on Linux, but may not be on your system. + diff --git a/gitattributes.html b/gitattributes.html index 6d002413..e01ee4c6 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -2018,8 +2018,8 @@ will be stored via placeholder %P.

    conflict-marker-size

    This attribute controls the length of conflict markers left in -the work tree file during a conflicted merge. Only setting to -the value to a positive integer has any meaningful effect.

    +the work tree file during a conflicted merge. Only a positive +integer has a meaningful effect.

    For example, this line in .gitattributes can be used to tell the merge machinery to leave much longer (instead of the usual 7-character-long) conflict markers when merging the file Documentation/git-merge.txt @@ -2246,7 +2246,7 @@ frotz unspecified

    diff --git a/gitattributes.txt b/gitattributes.txt index 6deb89a2..8c1793c1 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -1151,8 +1151,8 @@ will be stored via placeholder `%P`. ^^^^^^^^^^^^^^^^^^^^^^ This attribute controls the length of conflict markers left in -the work tree file during a conflicted merge. Only setting to -the value to a positive integer has any meaningful effect. +the work tree file during a conflicted merge. Only a positive +integer has a meaningful effect. For example, this line in `.gitattributes` can be used to tell the merge machinery to leave much longer (instead of the usual 7-character-long) diff --git a/gitcli.html b/gitcli.html index 4ed8ec24..0b4d92d3 100644 --- a/gitcli.html +++ b/gitcli.html @@ -1052,7 +1052,7 @@ The two options can be specified together to ask a command to work diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 8821f1d4..1f2c8b2b 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -2458,7 +2458,7 @@ to follow, not easier.

    diff --git a/gitcredentials.html b/gitcredentials.html index a05dc5bc..b79e4c2b 100644 --- a/gitcredentials.html +++ b/gitcredentials.html @@ -1122,7 +1122,7 @@ helpers will just ignore the new requests).

    diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 2018d1ab..a4dbd62d 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html @@ -957,7 +957,7 @@ repositories without the need for a central maintainer.

    diff --git a/gitdiffcore.html b/gitdiffcore.html index b29f3334..9e44a45b 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html @@ -1108,7 +1108,7 @@ not sorted when diffcore-order is in effect.

    diff --git a/giteveryday.html b/giteveryday.html index dc3e76aa..68388d9c 100644 --- a/giteveryday.html +++ b/giteveryday.html @@ -1180,7 +1180,7 @@ without a formal "merging". Or longhand

    An alternate participant submission mechanism is using the -git request-pull or pull-request mechanisms (e.g as used on +git request-pull or pull-request mechanisms (e.g. as used on GitHub (www.github.com) to notify your upstream of your contribution.

    @@ -1546,7 +1546,7 @@ create and push version tags. diff --git a/giteveryday.txt b/giteveryday.txt index 12b62b91..6cfdd0e0 100644 --- a/giteveryday.txt +++ b/giteveryday.txt @@ -229,7 +229,7 @@ without a formal "merging". Or longhand + git am -3 -k` An alternate participant submission mechanism is using the -`git request-pull` or pull-request mechanisms (e.g as used on +`git request-pull` or pull-request mechanisms (e.g. as used on GitHub (www.github.com) to notify your upstream of your contribution. diff --git a/gitfaq.html b/gitfaq.html index 3ca5875c..70aba080 100644 --- a/gitfaq.html +++ b/gitfaq.html @@ -1262,7 +1262,7 @@ platform.

    diff --git a/gitformat-bundle.html b/gitformat-bundle.html index 10befb28..a962c88d 100644 --- a/gitformat-bundle.html +++ b/gitformat-bundle.html @@ -879,7 +879,7 @@ bundle to abort.

    diff --git a/gitformat-chunk.html b/gitformat-chunk.html index 99740cea..2a08dad2 100644 --- a/gitformat-chunk.html +++ b/gitformat-chunk.html @@ -888,7 +888,7 @@ for future formats:

    diff --git a/gitformat-commit-graph.html b/gitformat-commit-graph.html index feaa323e..48084b51 100644 --- a/gitformat-commit-graph.html +++ b/gitformat-commit-graph.html @@ -1076,7 +1076,7 @@ chunks and write the new information without trusting the incorrect data.

    Last updated - 2022-11-11 23:55:30 PST + 2022-11-12 16:55:30 JST
    diff --git a/gitformat-index.html b/gitformat-index.html index 940ea0cf..204dd3e8 100644 --- a/gitformat-index.html +++ b/gitformat-index.html @@ -1493,7 +1493,7 @@ this extension. diff --git a/gitformat-pack.html b/gitformat-pack.html index 6632dcb1..f17504b4 100644 --- a/gitformat-pack.html +++ b/gitformat-pack.html @@ -1552,7 +1552,7 @@ support for optional chunks of data, it may make sense to consolidate the diff --git a/gitformat-signature.html b/gitformat-signature.html index da48c3b9..90266d40 100644 --- a/gitformat-signature.html +++ b/gitformat-signature.html @@ -1064,7 +1064,7 @@ Date: Wed Jun 15 09:13:29 2016 +0000 diff --git a/gitglossary.html b/gitglossary.html index c0a12c66..1f79014c 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1973,7 +1973,7 @@ The most notable example is HEAD.

    diff --git a/githooks.html b/githooks.html index 6d1777df..9ec0b207 100644 --- a/githooks.html +++ b/githooks.html @@ -1442,7 +1442,7 @@ running passing "1", "1" should not be possible.

    diff --git a/gitignore.html b/gitignore.html index 4203adea..4a72a80d 100644 --- a/gitignore.html +++ b/gitignore.html @@ -1073,7 +1073,7 @@ everything within foo/bar):

    diff --git a/gitk.html b/gitk.html index e185f898..a2eabfc3 100644 --- a/gitk.html +++ b/gitk.html @@ -771,7 +771,7 @@ options applicable to the git diff-* commands to control how the changes each commit introduces are shown. Finally, it supports some gitk-specific options.

    gitk generally only understands options with arguments in the -sticked form (see gitcli(7)) due to limitations in the +stuck form (see gitcli(7)) due to limitations in the command-line parser.

    rev-list options and arguments

    @@ -1101,7 +1101,7 @@ of end users.

    diff --git a/gitk.txt b/gitk.txt index d50e9ed1..c2213bb7 100644 --- a/gitk.txt +++ b/gitk.txt @@ -26,7 +26,7 @@ changes each commit introduces are shown. Finally, it supports some gitk-specific options. gitk generally only understands options with arguments in the -'sticked' form (see linkgit:gitcli[7]) due to limitations in the +'stuck' form (see linkgit:gitcli[7]) due to limitations in the command-line parser. rev-list options and arguments diff --git a/gitmailmap.html b/gitmailmap.html index 0e095185..21e04216 100644 --- a/gitmailmap.html +++ b/gitmailmap.html @@ -892,7 +892,7 @@ Jane Doe <jane@example.com> Jane <bugs@example.com> diff --git a/gitmodules.html b/gitmodules.html index a5fae00b..4206b680 100644 --- a/gitmodules.html +++ b/gitmodules.html @@ -948,7 +948,7 @@ submodules a URL is specified which can be used for cloning the submodules.

    < diff --git a/gitnamespaces.html b/gitnamespaces.html index 5f21d87d..df10c214 100644 --- a/gitnamespaces.html +++ b/gitnamespaces.html @@ -850,7 +850,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends diff --git a/gitprotocol-capabilities.html b/gitprotocol-capabilities.html index 3b4d5dec..d28572d1 100644 --- a/gitprotocol-capabilities.html +++ b/gitprotocol-capabilities.html @@ -1154,7 +1154,7 @@ and users of the session ID should not rely on this fact.

    diff --git a/gitprotocol-common.html b/gitprotocol-common.html index 90d5db18..7ab286d1 100644 --- a/gitprotocol-common.html +++ b/gitprotocol-common.html @@ -889,7 +889,7 @@ pkt-line ("0004").

    diff --git a/gitprotocol-http.html b/gitprotocol-http.html index 0285551f..bed49718 100644 --- a/gitprotocol-http.html +++ b/gitprotocol-http.html @@ -1279,7 +1279,7 @@ update = old_id SP new_id SP name diff --git a/gitprotocol-pack.html b/gitprotocol-pack.html index dc70204f..72ebc417 100644 --- a/gitprotocol-pack.html +++ b/gitprotocol-pack.html @@ -1494,7 +1494,7 @@ can be rejected.

    diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html index 7080f39a..69d06f3d 100644 --- a/gitprotocol-v2.html +++ b/gitprotocol-v2.html @@ -1719,7 +1719,7 @@ headers of that bundle or bundles.

    diff --git a/gitremote-helpers.html b/gitremote-helpers.html index 57b29583..5181b9d6 100644 --- a/gitremote-helpers.html +++ b/gitremote-helpers.html @@ -1537,7 +1537,7 @@ the remote side using that algorithm.

    diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 1fe37233..17b40f6b 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html @@ -1372,7 +1372,7 @@ GIT_COMMON_DIR/worktrees/<id>/config.worktree)

    diff --git a/gitrevisions.html b/gitrevisions.html index 764b805a..cc63fe39 100644 --- a/gitrevisions.html +++ b/gitrevisions.html @@ -1417,7 +1417,7 @@ spelt out:

    diff --git a/gitsubmodules.html b/gitsubmodules.html index f125266d..853f320b 100644 --- a/gitsubmodules.html +++ b/gitsubmodules.html @@ -1113,7 +1113,7 @@ affects other Git commands, see git-config(1) for diff --git a/gittutorial-2.html b/gittutorial-2.html index 4be9cc51..3f6717ba 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html @@ -1171,7 +1171,7 @@ example, creating a new commit.

    diff --git a/gittutorial.html b/gittutorial.html index 78b57f99..3eadf051 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -1374,7 +1374,7 @@ digressions that may be interesting at this point are:

    diff --git a/gitweb.conf.html b/gitweb.conf.html index 9369a341..cb5bd4fb 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html @@ -2015,7 +2015,7 @@ gitweb_config.perl diff --git a/gitweb.html b/gitweb.html index d9c01c75..044ac94f 100644 --- a/gitweb.html +++ b/gitweb.html @@ -1642,7 +1642,7 @@ putting "gitweb" in the subject of email.

    diff --git a/gitworkflows.html b/gitworkflows.html index 4c63bc67..e68de91f 100644 --- a/gitworkflows.html +++ b/gitworkflows.html @@ -1225,7 +1225,7 @@ other options.

    diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index c9602354..3b5f7f2c 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index f1d68c7b..6d496c68 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -939,7 +939,7 @@ tip of your master again and redo the two merges:

    diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 010ef9e7..6e28c538 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1479,7 +1479,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index c02fecbf..b0b87806 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -864,7 +864,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 87ce5764..8f621908 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -896,7 +896,7 @@ the #1' commit.

    diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 2d9debf3..cba36f7a 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -848,7 +848,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index d21b974f..79500256 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -881,7 +881,7 @@ thing.

    diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 085dd5b4..a589ca8b 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1190,7 +1190,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index ef142dda..be1f4490 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1026,7 +1026,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 5261fcf9..3faf570d 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -908,7 +908,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index b19f1efa..0502ad3e 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -842,7 +842,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 76a25050..0cb250d4 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1072,7 +1072,7 @@ help diagnosing the problem, but removes security checks.

    diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index bc9515dc..95fe23ca 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -931,7 +931,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 b14bc7a0..6b8e27a2 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -792,7 +792,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 1fb1147d..da4e1da6 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -849,7 +849,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 87195c2c..56ce9ba4 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -953,7 +953,7 @@ as part of the merge commit.

    diff --git a/scalar.html b/scalar.html index 36729baf..b39c140d 100644 --- a/scalar.html +++ b/scalar.html @@ -999,7 +999,7 @@ delete <enlistment> diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index fb913308..b87c8528 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -879,7 +879,7 @@ a message, pass a strbuf that is explicitly ignored:

    diff --git a/technical/api-index.html b/technical/api-index.html index 25ba484f..d350cfd4 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -776,7 +776,7 @@ documents them.

    diff --git a/technical/api-merge.html b/technical/api-merge.html index bec282e6..83fc1d51 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -802,7 +802,7 @@ and diff.c for examples.

    diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 38531ea6..709233d5 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1352,7 +1352,7 @@ for real-world examples.

    diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index 5d2e56db..4f3382f8 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -841,7 +841,7 @@ layer to focus on the task at hand.

    diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 8dc54b3b..991bd623 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -2355,7 +2355,7 @@ Trace2 targets (and convert <key> to a "category"). diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index e8fa24b4..fb76b391 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1209,7 +1209,7 @@ xor_row (4 byte integer, network byte order): diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index f5b25cd7..60a7399a 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1464,7 +1464,7 @@ would cause these on-demand downloads to be too aggressive.

    diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index 4af821f8..ec736646 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -2088,7 +2088,7 @@ See the history of this file in git.git for the history of subsequent diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 67cb5c10..ec14fb9a 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -796,7 +796,7 @@ process has stopped.

    diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 0f786b11..ee162023 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -913,7 +913,7 @@ Packfiles can be marked as "special" using empty files that share diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index b7e39085..abf5d709 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1344,7 +1344,7 @@ so obvious that they never go anywhere. diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index f830cf28..7b2daba8 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1076,7 +1076,7 @@ err |= run_parallel_checkout(&state, pc_workers, pc_threshold, NULL, NULL);< diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 2d454599..4ef76f23 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -1214,7 +1214,7 @@ type of packfile that references it.

    diff --git a/technical/racy-git.html b/technical/racy-git.html index 50b13cfa..96eb1575 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -953,7 +953,7 @@ practice anymore. This was done with commit 0fc82cff on Aug 15, diff --git a/technical/reftable.html b/technical/reftable.html index d226a686..0b6e6315 100644 --- a/technical/reftable.html +++ b/technical/reftable.html @@ -2056,7 +2056,7 @@ impossible.

    diff --git a/technical/scalar.html b/technical/scalar.html index b5ec55e9..bcac3051 100644 --- a/technical/scalar.html +++ b/technical/scalar.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -834,7 +834,7 @@ built and installed as its own executable in the bin/ directory, al diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index 51bd9c19..f650f1cb 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -828,7 +828,7 @@ closes the reading side of the pipe and fd to receive-pack.

    diff --git a/technical/shallow.html b/technical/shallow.html index 2e975c96..655a3198 100644 --- a/technical/shallow.html +++ b/technical/shallow.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -814,7 +814,7 @@ number a signed 32-bit integer can contain) means infinite depth.

    diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 10cfc7b8..143f56f9 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html @@ -735,7 +735,7 @@ asciidoc.install();
    @@ -857,7 +857,7 @@ the automatic merge will generally give this effect.

    diff --git a/user-manual.html b/user-manual.html index 04eb9909..7646cb54 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

    Git User Manual

    Revision History
    2023-10-23

    Table of Contents

    Introduction
    1. Repositories and Branches
    How to get a Git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git fetch
    Fetching branches from other repositories
    2. Exploring Git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with Git
    Telling Git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git pull
    Submitting patches to a project
    Importing patches to a project
    Public Git repositories
    Setting up a public repository
    Exporting a Git repository via the Git protocol
    Exporting a git repository via HTTP
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    How to get a Git repository with minimal history
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Using interactive rebases
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git fetch to do non-fast-forward updates
    Configuring remote-tracking branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How Git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level Git operations
    Object access and manipulation
    The Workflow
    working directory → index
    index → object database
    object database → index
    index → working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking Git
    Object storage format
    A birds-eye view of Git’s source code
    11. Git Glossary
    Git explained
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual
    Todo list

    Introduction

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX +Git User Manual

    Git User Manual

    Revision History
    2023-10-29

    Table of Contents

    Introduction
    1. Repositories and Branches
    How to get a Git repository
    How to check out a different version of a project
    Understanding History: Commits
    Understanding history: commits, parents, and reachability
    Understanding history: History diagrams
    Understanding history: What is a branch?
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git fetch
    Fetching branches from other repositories
    2. Exploring Git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Counting the number of commits on a branch
    Check whether two branches point at the same history
    Find first tagged version including a given fix
    Showing commits unique to a given branch
    Creating a changelog and tarball for a software release
    Finding commits referencing a file with given content
    3. Developing with Git
    Telling Git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Getting conflict-resolution help during a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Fixing a mistake with a new commit
    Fixing a mistake by rewriting history
    Checking out an old version of a file
    Temporarily setting aside work in progress
    Ensuring good performance
    Ensuring reliability
    Checking the repository for corruption
    Recovering lost changes
    4. Sharing development with others
    Getting updates with git pull
    Submitting patches to a project
    Importing patches to a project
    Public Git repositories
    Setting up a public repository
    Exporting a Git repository via the Git protocol
    Exporting a git repository via HTTP
    Pushing changes to a public repository
    What to do when a push fails
    Setting up a shared repository
    Allowing web browsing of a repository
    How to get a Git repository with minimal history
    Examples
    Maintaining topic branches for a Linux subsystem maintainer
    5. Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Using interactive rebases
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    6. Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git fetch to do non-fast-forward updates
    Configuring remote-tracking branches
    7. Git concepts
    The Object Database
    Commit Object
    Tree Object
    Blob Object
    Trust
    Tag Object
    How Git stores objects efficiently: pack files
    Dangling objects
    Recovering from repository corruption
    The index
    8. Submodules
    Pitfalls with submodules
    9. Low-level Git operations
    Object access and manipulation
    The Workflow
    working directory → index
    index → object database
    object database → index
    index → working directory
    Tying it all together
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    10. Hacking Git
    Object storage format
    A birds-eye view of Git’s source code
    11. Git Glossary
    Git explained
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual
    Todo list

    Introduction

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.

    Chapter 1, Repositories and Branches and Chapter 2, Exploring Git history explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for -- 2.11.4.GIT