From a7b2c10835189668841231edffc77e7dbb020487 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Jun 2023 14:00:15 -0700 Subject: Autogenerated HTML docs for v2.41.0-28-gd7d884 --- MyFirstContribution.html | 4 +- MyFirstObjectWalk.html | 4 +- RelNotes/2.42.0.txt | 39 ++++++++++++++++ ReviewingGuidelines.html | 4 +- SubmittingPatches.html | 4 +- ToolsForGit.html | 4 +- diff-options.txt | 7 ++- everyday.html | 4 +- git-add.html | 2 +- git-am.html | 2 +- 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 | 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 | 2 +- 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 | 8 ++-- git-diff-index.html | 8 ++-- git-diff-tree.html | 8 ++-- git-diff.html | 8 ++-- 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 | 8 ++-- git-ls-files.html | 20 +++++++- git-ls-files.txt | 6 +++ git-ls-remote.html | 69 +++++++++++++++++++++------- git-ls-remote.txt | 48 ++++++++++++++----- 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 | 37 +++++++++++++-- git-pack-refs.txt | 29 ++++++++++-- git-patch-id.html | 2 +- git-prune-packed.html | 2 +- git-prune.html | 2 +- git-pull.html | 2 +- git-push.html | 2 +- git-quiltimport.html | 2 +- git-range-diff.html | 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 | 2 +- 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 | 2 +- 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 | 17 ++++--- git-show-branch.txt | 16 +++---- git-show-index.html | 2 +- git-show-ref.html | 40 ++++++++++------ git-show-ref.txt | 40 ++++++++++------ git-show.html | 8 ++-- 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 | 21 ++++++++- git-tag.txt | 10 ++++ 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 | 2 +- gitattributes.html | 2 +- gitcli.html | 2 +- gitcore-tutorial.html | 2 +- gitcredentials.html | 2 +- gitcvs-migration.html | 2 +- gitdiffcore.html | 2 +- giteveryday.html | 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 | 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 +- 247 files changed, 611 insertions(+), 372 deletions(-) create mode 100644 RelNotes/2.42.0.txt diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 0a2f8aa5d..b4c1d97cc 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -2061,7 +2061,7 @@ should generate your diffs from <topic>..<mybranch> and diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index a4812fceb..fbcc392e2 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1723,7 +1723,7 @@ Changed the display order of the filtered object walk diff --git a/RelNotes/2.42.0.txt b/RelNotes/2.42.0.txt new file mode 100644 index 000000000..f59fd7922 --- /dev/null +++ b/RelNotes/2.42.0.txt @@ -0,0 +1,39 @@ +Git v2.42 Release Notes +======================= + +UI, Workflows & Features + + * "git pack-refs" learns "--include" and "--exclude" to tweak the ref + hierarchy to be packed using pattern matching. + + +Performance, Internal Implementation, Development Support etc. + + * "git diff-tree" has been taught to take advantage of the + sparse-index feature. + + +Fixes since v2.41 +----------------- + + * "git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the + command failed, so that the user can salvage what they typed. + (merge 08c12ec1d0 kh/keep-tag-editmsg-upon-failure later to maint). + + * The "-s" (silent, squelch) option of the "diff" family of commands + did not interact with other options that specify the output format + well. This has been cleaned up so that it will clear all the + formatting options given before. + (merge 9d484b92ed jc/diff-s-with-other-options later to maint). + + * Update documentation regarding Coccinelle patches. + (merge 3bd0097cfc gc/doc-cocci-updates later to maint). + + * Some atoms that can be used in "--format=" for "git ls-tree" + were not supported by "git ls-files", even though they were relevant + in the context of the latter. + (merge 4d28c4f75f zh/ls-files-format-atoms later to maint). + + * Other code cleanup, docfix, build fix, etc. + (merge 51f9d2e563 sa/doc-ls-remote later to maint). + (merge c6d26a9dda jk/format-patch-message-id-unleak later to maint). diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index afd06f787..85ad93cec 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 d69ea54f0..2980db3de 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -735,7 +735,7 @@ asciidoc.install();
@@ -1447,7 +1447,7 @@ this problem around.

diff --git a/ToolsForGit.html b/ToolsForGit.html index 40b03f4bd..af3d788b6 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/diff-options.txt b/diff-options.txt index 08ab86189..9f33f8877 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -35,8 +35,11 @@ endif::git-diff[] -s:: --no-patch:: - Suppress diff output. Useful for commands like `git show` that - show the patch by default, or to cancel the effect of `--patch`. + Suppress all output from the diff machinery. Useful for + commands like `git show` that show the patch by default to + squelch their output, or to cancel the effect of options like + `--patch`, `--stat` earlier on the command line in an alias. + endif::git-format-patch[] ifdef::git-log[] diff --git a/everyday.html b/everyday.html index fea604b05..89b24ef43 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 7e41b4abe..1514e39e9 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 447d9e6d8..ff0f2d648 100644 --- a/git-am.html +++ b/git-am.html @@ -1289,7 +1289,7 @@ am.threeWay diff --git a/git-annotate.html b/git-annotate.html index 3ce050a0c..d38dbe2a2 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -1089,7 +1089,7 @@ take effect.

diff --git a/git-apply.html b/git-apply.html index c19abaac2..b4c495cfe 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 74ae5b094..488402165 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 a63f0d1ca..a6088b0dc 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 f18a8a602..d52641774 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -1240,7 +1240,7 @@ help or git bisect -h to get a long usage description.

Last updated - 2020-09-12 15:36:57 JST + 2020-09-11 23:36:57 PDT
diff --git a/git-blame.html b/git-blame.html index f599dce83..f0b4415ab 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 e8628cd11..76182852b 100644 --- a/git-branch.html +++ b/git-branch.html @@ -1592,7 +1592,7 @@ a branch?” in the Git User’s Manual.

diff --git a/git-bugreport.html b/git-bugreport.html index caeb37e33..4374c93c9 100644 --- a/git-bugreport.html +++ b/git-bugreport.html @@ -879,7 +879,7 @@ about their usage.

diff --git a/git-bundle.html b/git-bundle.html index 696f2b00b..2c870b953 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 e5bb558c6..fadfda4fe 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -1330,7 +1330,7 @@ will be reported.

diff --git a/git-check-attr.html b/git-check-attr.html index 25e6a5af1..6dc9cb7ea 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 3f60c4ea2..715633e71 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 a45a0bf97..421cbf80b 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 e52a7bfb2..639cb7ab0 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 9da25285d..3092e33bb 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 1d6d5d393..add5ff025 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -1630,7 +1630,7 @@ checkout.thresholdForParallelism diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 3b421e89e..353bbfb4f 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 6f997f85e..2f5665147 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 2769f7805..c7530ab18 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 dd78b23bd..fb95d958d 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 9267f6272..c87a956e5 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 69d5d1188..42b82bcce 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 a76d53e72..c7e3188b9 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 a7aeb0a9c..30a01ca6a 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 a13cdb07d..db1e2e4a8 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 691240be2..a5ee60ba9 100644 --- a/git-config.html +++ b/git-config.html @@ -11709,7 +11709,7 @@ looks like

diff --git a/git-count-objects.html b/git-count-objects.html index d989883f7..e13c6b1a2 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 35672fcd5..0b7a87414 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 252aed4dd..8ef664dc4 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 bfb98cabd..1bcd68344 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 e0ea6e153..c355f9e8c 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 5f2236503..71f742872 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 83ecbbe0c..af3a9caee 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 38b958144..023c14c75 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 2f3f792e5..11074ebda 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 baeb95d61..865764356 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 505b40e4c..4fc838819 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 68e712fda..424654201 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -790,8 +790,10 @@ same as for git diff-index and git diff-tree.

- Suppress diff output. Useful for commands like git show that - show the patch by default, or to cancel the effect of --patch. + Suppress all output from the diff machinery. Useful for + commands like git show that show the patch by default to + squelch their output, or to cancel the effect of options like + --patch, --stat earlier on the command line in an alias.

@@ -2714,7 +2716,7 @@ the pathname, but if that is NUL, the record will show two paths.
Last updated - 2022-10-29 03:53:56 JST + 2022-10-28 11:53:56 PDT
diff --git a/git-diff-index.html b/git-diff-index.html index 14cddcb2c..ee2cddeda 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -791,8 +791,10 @@ files are compared.

- Suppress diff output. Useful for commands like git show that - show the patch by default, or to cancel the effect of --patch. + Suppress all output from the diff machinery. Useful for + commands like git show that show the patch by default to + squelch their output, or to cancel the effect of options like + --patch, --stat earlier on the command line in an alias.

@@ -2808,7 +2810,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 25dee23d2..9d9ac4ec4 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -792,8 +792,10 @@ git-diff-tree(1) Manual Page

- Suppress diff output. Useful for commands like git show that - show the patch by default, or to cancel the effect of --patch. + Suppress all output from the diff machinery. Useful for + commands like git show that show the patch by default to + squelch their output, or to cancel the effect of options like + --patch, --stat earlier on the command line in an alias.

@@ -3995,7 +3997,7 @@ the pathname, but if that is NUL, the record will show two paths.
Last updated - 2021-12-11 07:52:02 JST + 2021-12-10 14:52:02 PST
diff --git a/git-diff.html b/git-diff.html index 94f815421..5cf1b5ead 100644 --- a/git-diff.html +++ b/git-diff.html @@ -924,8 +924,10 @@ and the range notations (<commit>..<commit> and

- Suppress diff output. Useful for commands like git show that - show the patch by default, or to cancel the effect of --patch. + Suppress all output from the diff machinery. Useful for + commands like git show that show the patch by default to + squelch their output, or to cancel the effect of options like + --patch, --stat earlier on the command line in an alias.

@@ -3657,7 +3659,7 @@ diff.colorMovedWS diff --git a/git-difftool.html b/git-difftool.html index 5bd3dcbb4..6f904f826 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 5de4830b3..fa7da2179 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 5b6a6461f..db44a65ee 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 d4e373955..91927de49 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 8d958cb5a..ee746259f 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-16 08:02:03 JST + 2023-05-15 16:02:03 PDT
diff --git a/git-filter-branch.html b/git-filter-branch.html index bb44565f2..73d68b573 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 448dc1fe7..6966f1e8b 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 55c7e258e..9483a4827 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -1367,7 +1367,7 @@ commits and from none of the --no-merged commits are shown.

Last updated - 2023-04-22 07:58:28 JST + 2023-04-21 15:58:28 PDT
diff --git a/git-for-each-repo.html b/git-for-each-repo.html index 4ee705935..1b269897a 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-21 15:32:32 JST + 2020-11-20 22:32:32 PST
diff --git a/git-format-patch.html b/git-format-patch.html index d84db335a..39ab69211 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -2603,7 +2603,7 @@ merge commit.

diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 61b56b38b..661817647 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 ac881c3ab..51f80dba4 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -1579,7 +1579,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-fsmonitor--daemon.html b/git-fsmonitor--daemon.html index dddbbb356..80dcb9852 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 04b30167c..fb7930eaa 100644 --- a/git-gc.html +++ b/git-gc.html @@ -1189,7 +1189,7 @@ seems to be low in practice).

diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index e5e6ef9ec..e63c21cf1 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 10734aa2f..cee178ff1 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 fbaad6363..d297f8836 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 e43c4b079..40ee5e038 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -854,7 +854,7 @@ When <type> is not specified, it defaults to "blob".

diff --git a/git-help.html b/git-help.html index 591418695..12a904cf6 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 8e2e7d9d9..45a6e23d4 100644 --- a/git-hook.html +++ b/git-hook.html @@ -824,7 +824,7 @@ mandatory -- (or --end-of-options, see
Last updated - 2023-02-23 08:29:29 JST + 2023-02-22 15:29:29 PST
diff --git a/git-http-backend.html b/git-http-backend.html index d95b82eb3..a9975459e 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 a2c0362fb..fc1a54411 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 9522c736e..0b45400c0 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 7059f73f4..f6c1f3b0e 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 f4e55e204..586407f01 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -981,7 +981,7 @@ mentioned above.

diff --git a/git-init-db.html b/git-init-db.html index a9ff2fc0a..407cb0782 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 8829063ae..743f0cf01 100644 --- a/git-init.html +++ b/git-init.html @@ -1034,7 +1034,7 @@ init.defaultBranch diff --git a/git-instaweb.html b/git-instaweb.html index f0e88934b..23f6e050a 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 d46362b79..2d00f1a8b 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html @@ -1343,7 +1343,7 @@ $ chmod +x .git/hooks/commit-msg diff --git a/git-log.html b/git-log.html index 5798369f1..4a08cba3e 100644 --- a/git-log.html +++ b/git-log.html @@ -3512,8 +3512,10 @@ the default format.

- Suppress diff output. Useful for commands like git show that - show the patch by default, or to cancel the effect of --patch. + Suppress all output from the diff machinery. Useful for + commands like git show that show the patch by default to + squelch their output, or to cancel the effect of options like + --patch, --stat earlier on the command line in an alias.

@@ -5589,7 +5591,7 @@ See notes.rewrite.<command> above for a further description o diff --git a/git-ls-files.html b/git-ls-files.html index ec4df97ee..8462ae45e 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -1258,6 +1258,14 @@ objectmode

+objecttype +
+
+

+ The object type of the file which is recorded in the index. +

+
+
objectname
@@ -1266,6 +1274,16 @@ objectname

+objectsize[:padded] +
+
+

+ The object size of the file which is recorded in the index + ("-" if the object is a commit or tree). + It also supports a padded format of size with "%(objectsize:padded)". +

+
+
stage
@@ -1364,7 +1382,7 @@ pattern file appears in.

diff --git a/git-ls-files.txt b/git-ls-files.txt index 1abdd3c21..1bc0328bb 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -270,8 +270,14 @@ interpolated. The following "fieldname" are understood: objectmode:: The mode of the file which is recorded in the index. +objecttype:: + The object type of the file which is recorded in the index. objectname:: The name of the file which is recorded in the index. +objectsize[:padded]:: + The object size of the file which is recorded in the index + ("-" if the object is a `commit` or `tree`). + It also supports a padded format of size with "%(objectsize:padded)". stage:: The stage of the file which is recorded in the index. eolinfo:index:: diff --git a/git-ls-remote.html b/git-ls-remote.html index e5de75891..90781ddd3 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -911,28 +911,63 @@ commit IDs.

+

OUTPUT

+
+

The output is in the format:

+
+
+
<oid> TAB <ref> LF
+
+

When showing an annotated tag, unless --refs is given, two such +lines are shown: one with the refname for the tag itself as <ref>, +and another with <ref> followed by ^{}. The <oid> on the latter +line shows the name of the object the tag points at.

+
+
+

EXAMPLES

+
    +
  • +

    +List all references (including symbolics and pseudorefs), peeling + tags: +

    -
    $ git ls-remote --tags .
-d6602ec5194c87b0fc87103ca4d67251c76f233a        refs/tags/v0.99
-f25a265a342aed6041ab0cc484224d9ca54b6f41        refs/tags/v0.99.1
-7ceca275d047c90c0c7d5afb13ab97efdf51bd6e        refs/tags/v0.99.3
-c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
-0918385dbd9656cab0d1d81ba7453d49bbc16250        refs/tags/junio-gpg-pub
-
-$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
+
    $ git ls-remote
+27d43aaaf50ef0ae014b88bba294f93658016a2e        HEAD
+950264636c68591989456e3ba0a5442f93152c1a        refs/heads/main
+d9ab777d41f92a8c1684c91cfb02053d7dd1046b        refs/heads/next
+d4ca2e3147b409459955613c152220f4db848ee1        refs/tags/v2.40.0
+73876f4861cd3d187a4682290ab75c9dccadbc56        refs/tags/v2.40.0^{}
    
+
    +
    • +
  • +

    +List all references matching given patterns: +

    +
    +
    +
    $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
 5fe978a5381f1fbad26a80e682ddd2a401966740        refs/heads/master
-c781a84b5204fb294c9ccc79f8b3baceeb32c061        refs/heads/seen
-
-$ git remote add korg http://www.kernel.org/pub/scm/git/git.git
-$ git ls-remote --tags korg v\*
-d6602ec5194c87b0fc87103ca4d67251c76f233a        refs/tags/v0.99
-f25a265a342aed6041ab0cc484224d9ca54b6f41        refs/tags/v0.99.1
-c5db5456ae3b0873fc659c19fafdde22313cc441        refs/tags/v0.99.2
-7ceca275d047c90c0c7d5afb13ab97efdf51bd6e        refs/tags/v0.99.3
    +c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen     +
    +
    • +
  • +

    +List only tags matching a given wildcard pattern: +

    +
    +
    +
    $ git ls-remote --tags http://www.kernel.org/pub/scm/git/git.git v\*
+485a869c64a68cc5795dd99689797c5900f4716d        refs/tags/v2.39.2
+cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6        refs/tags/v2.39.2^{}
+d4ca2e3147b409459955613c152220f4db848ee1        refs/tags/v2.40.0
+73876f4861cd3d187a4682290ab75c9dccadbc56        refs/tags/v2.40.0^{}
    +
    • +
@@ -952,7 +987,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-remote.txt b/git-ls-remote.txt index ff3da547d..1c4f696ab 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -96,27 +96,51 @@ OPTIONS separator (so `bar` matches `refs/heads/bar` but not `refs/heads/foobar`). +OUTPUT +------ + +The output is in the format: + +------------ + TAB LF +------------ + +When showing an annotated tag, unless `--refs` is given, two such +lines are shown: one with the refname for the tag itself as ``, +and another with `` followed by `^{}`. The `` on the latter +line shows the name of the object the tag points at. + EXAMPLES -------- +* List all references (including symbolics and pseudorefs), peeling + tags: ++ +---- +$ git ls-remote +27d43aaaf50ef0ae014b88bba294f93658016a2e HEAD +950264636c68591989456e3ba0a5442f93152c1a refs/heads/main +d9ab777d41f92a8c1684c91cfb02053d7dd1046b refs/heads/next +d4ca2e3147b409459955613c152220f4db848ee1 refs/tags/v2.40.0 +73876f4861cd3d187a4682290ab75c9dccadbc56 refs/tags/v2.40.0^{} ---- -$ git ls-remote --tags . -d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 -f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 -7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3 -c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 -0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub +* List all references matching given patterns: ++ +---- $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen +---- -$ git remote add korg http://www.kernel.org/pub/scm/git/git.git -$ git ls-remote --tags korg v\* -d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 -f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 -c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 -7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3 +* List only tags matching a given wildcard pattern: ++ +---- +$ git ls-remote --tags http://www.kernel.org/pub/scm/git/git.git v\* +485a869c64a68cc5795dd99689797c5900f4716d refs/tags/v2.39.2 +cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 refs/tags/v2.39.2^{} +d4ca2e3147b409459955613c152220f4db848ee1 refs/tags/v2.40.0 +73876f4861cd3d187a4682290ab75c9dccadbc56 refs/tags/v2.40.0^{} ---- SEE ALSO diff --git a/git-ls-tree.html b/git-ls-tree.html index daa7b152a..a330dd096 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 c6581be19..1daf955f3 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 9fd910dc5..cd57d9c38 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 0be8fd58a..e4fc32214 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 f093175ed..2dd37db5a 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 9880a987c..f4e828267 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 d4128b431..2cedbc821 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 907a4010f..1c961f491 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 d7956e1fa..9d4a158bd 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 facf99ff6..434551199 100644 --- a/git-merge.html +++ b/git-merge.html @@ -2327,7 +2327,7 @@ merge.<driver>.recursive diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index be33b0579..f69456238 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 f26ec90e9..9967ccc19 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 c277b6b96..4b3a9bc0e 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 cf200a547..ec61aa492 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 8e0a906df..db7631bb8 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 bd4e948e7..71c0b6755 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 ad1542bb7..3d8145860 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 6decfb7ad..230ed94ac 100644 --- a/git-notes.html +++ b/git-notes.html @@ -1362,7 +1362,7 @@ on the notes.rewrite.<command> and notes.rewriteRef
Last updated - 2022-09-15 05:23:11 JST + 2022-09-14 13:23:11 PDT
diff --git a/git-p4.html b/git-p4.html index ee0d4df6e..ed16cfbd7 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 d54febfbe..4d806f2c2 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -1390,7 +1390,7 @@ attribute delta set to false.

diff --git a/git-pack-redundant.html b/git-pack-redundant.html index e0002ac5d..92bfb27ba 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 160e4e64a..851b6de27 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -749,7 +749,7 @@ git-pack-refs(1) Manual Page

SYNOPSIS

-
git pack-refs [--all] [--no-prune]
+
git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude <pattern>]
@@ -796,8 +796,9 @@ The command by default packs all tags and refs that are already packed, and leaves other refs alone. This is because branches are expected to be actively developed and packing their tips does not help performance. -This option causes branch tips to be packed as well. Useful for -a repository with many branches of historical interests. +This option causes all refs to be packed as well, with the exception +of hidden refs, broken refs, and symbolic refs. Useful for a repository +with many branches of historical interests.

@@ -809,7 +810,35 @@ The command usually removes loose refs under $GIT_DIR/refs hierarchy after packing them. This option tells it not to.

+
+--include <pattern> +
+
+

+Pack refs based on a glob(7) pattern. Repetitions of this option +accumulate inclusion patterns. If a ref is both included in --include and +--exclude, --exclude takes precedence. Using --include will preclude all +tags from being included by default. Symbolic refs and broken refs will never +be packed. When used with --all, it will be a noop. Use --no-include to clear +and reset the list of patterns. +

+
+
+--exclude <pattern> +
+
+

+Do not pack refs matching the given glob(7) pattern. Repetitions of this option +accumulate exclusion patterns. Use --no-exclude to clear and reset the list of +patterns. If a ref is already packed, including it with --exclude will not +unpack it. +

+
+

When used with --all, pack only loose refs which do not match any of +the provided --exclude patterns.

+

When used with --include, refs provided to --include, minus refs that are +provided to --exclude will be packed.

@@ -831,7 +860,7 @@ exists" when it means "branch <branch> exists".

diff --git a/git-pack-refs.txt b/git-pack-refs.txt index 154081f2d..284956acb 100644 --- a/git-pack-refs.txt +++ b/git-pack-refs.txt @@ -8,7 +8,7 @@ git-pack-refs - Pack heads and tags for efficient repository access SYNOPSIS -------- [verse] -'git pack-refs' [--all] [--no-prune] +'git pack-refs' [--all] [--no-prune] [--include ] [--exclude ] DESCRIPTION ----------- @@ -51,14 +51,37 @@ The command by default packs all tags and refs that are already packed, and leaves other refs alone. This is because branches are expected to be actively developed and packing their tips does not help performance. -This option causes branch tips to be packed as well. Useful for -a repository with many branches of historical interests. +This option causes all refs to be packed as well, with the exception +of hidden refs, broken refs, and symbolic refs. Useful for a repository +with many branches of historical interests. --no-prune:: The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after packing them. This option tells it not to. +--include :: + +Pack refs based on a `glob(7)` pattern. Repetitions of this option +accumulate inclusion patterns. If a ref is both included in `--include` and +`--exclude`, `--exclude` takes precedence. Using `--include` will preclude all +tags from being included by default. Symbolic refs and broken refs will never +be packed. When used with `--all`, it will be a noop. Use `--no-include` to clear +and reset the list of patterns. + +--exclude :: + +Do not pack refs matching the given `glob(7)` pattern. Repetitions of this option +accumulate exclusion patterns. Use `--no-exclude` to clear and reset the list of +patterns. If a ref is already packed, including it with `--exclude` will not +unpack it. + +When used with `--all`, pack only loose refs which do not match any of +the provided `--exclude` patterns. + +When used with `--include`, refs provided to `--include`, minus refs that are +provided to `--exclude` will be packed. + BUGS ---- diff --git a/git-patch-id.html b/git-patch-id.html index 47b008913..2ce031a5b 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 f2a5d8888..cdbe250da 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 646ce3f50..1ccb61fbc 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 2fabae733..5029d9a18 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 7f34f2319..4d7347eda 100644 --- a/git-push.html +++ b/git-push.html @@ -2181,7 +2181,7 @@ push.useBitmaps diff --git a/git-quiltimport.html b/git-quiltimport.html index d5af3f060..d17775bb8 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 d157f6df1..3a720e4d6 100644 --- a/git-range-diff.html +++ b/git-range-diff.html @@ -1085,7 +1085,7 @@ found in this case will look like this:

diff --git a/git-read-tree.html b/git-read-tree.html index dd2907204..716b1d4e4 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 e4c3458bb..345b408a8 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -2792,7 +2792,7 @@ sequence.editor diff --git a/git-receive-pack.html b/git-receive-pack.html index 6d6aa8708..dbdb992c9 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 82cafdf9a..a6265b239 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 84726c118..e81564705 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 66f3c243f..70a21290c 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 36f2374f8..33bbdfbc6 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 dc22f9c8a..9f04749ff 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 4af35d77a..00276b4db 100644 --- a/git-repack.html +++ b/git-repack.html @@ -1123,7 +1123,7 @@ attribute delta set to false.

diff --git a/git-replace.html b/git-replace.html index 1cdbfae73..edee34707 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 33db0b53d..5a8efb8d4 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 bd49b4712..335515835 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -990,7 +990,7 @@ setting in gitattributes(5) can be used.

Last updated - 2022-10-29 03:53:56 JST + 2022-10-28 11:53:56 PDT
diff --git a/git-reset.html b/git-reset.html index fb99c427b..0dfcc3530 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 a76166c64..389d9784f 100644 --- a/git-restore.html +++ b/git-restore.html @@ -1073,7 +1073,7 @@ as using git-checkout(1))

diff --git a/git-rev-list.html b/git-rev-list.html index b302a1591..1d51c84e8 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -3725,7 +3725,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 ee9cc471e..bcff2e06e 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -2077,7 +2077,7 @@ Similar to above: diff --git a/git-revert.html b/git-revert.html index f3cfb8951..9fbabbc16 100644 --- a/git-revert.html +++ b/git-revert.html @@ -1059,7 +1059,7 @@ revert.reference diff --git a/git-rm.html b/git-rm.html index 6c2454070..ee7d70018 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 9bf5485e4..eab7c37ac 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -1833,7 +1833,7 @@ Authen::SASL and Mail::Address.

diff --git a/git-send-pack.html b/git-send-pack.html index df56e8c14..c4354c91c 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 a5b9dc097..1aefa501c 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 80a63de30..b66da6e91 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 d12a58b22..15f6c34f7 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 675ea2d8f..8f46133c2 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 3d43412be..8d6a9253c 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -2030,7 +2030,7 @@ the current directory.

diff --git a/git-show-branch.html b/git-show-branch.html index 4ca59ad4f..5aaa5dc6f 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -866,8 +866,7 @@ no <rev> or <glob> is given on the command line.

that is the common ancestor of all the branches. This flag tells the command to go <n> more common commits beyond that. When <n> is negative, display only the - <reference>s given, without showing the commit ancestry - tree. + <ref>s given, without showing the commit ancestry tree.

@@ -895,8 +894,8 @@ no <rev> or <glob> is given on the command line.

- Among the <reference>s given, display only the ones that - cannot be reached from any other <reference>. + Among the <ref>s given, display only the ones that cannot be + reached from any other <ref>.

@@ -974,10 +973,10 @@ are mutually exclusive.

OUTPUT

-

Given N <references>, the first N lines are the one-line -description from their commit message. The branch head that is -pointed at by $GIT_DIR/HEAD is prefixed with an asterisk * -character while other heads are prefixed with a ! character.

+

Given N <ref>s, the first N lines are the one-line description from +their commit message. The branch head that is pointed at by +$GIT_DIR/HEAD is prefixed with an asterisk * character while other +heads are prefixed with a ! character.

Following these N lines, one-line log for each commit is displayed, indented N places. If a commit is on the I-th branch, the I-th indentation character shows a + sign; @@ -1066,7 +1065,7 @@ showBranch.default

diff --git a/git-show-branch.txt b/git-show-branch.txt index 71f608b1f..58cf6210c 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -74,8 +74,7 @@ OPTIONS that is the common ancestor of all the branches. This flag tells the command to go more common commits beyond that. When is negative, display only the - s given, without showing the commit ancestry - tree. + s given, without showing the commit ancestry tree. --list:: Synonym to `--more=-1` @@ -88,8 +87,8 @@ OPTIONS the case of three or more commits. --independent:: - Among the s given, display only the ones that - cannot be reached from any other . + Among the s given, display only the ones that cannot be + reached from any other . --no-name:: Do not show naming strings for each commit. @@ -132,10 +131,11 @@ are mutually exclusive. OUTPUT ------ -Given N , the first N lines are the one-line -description from their commit message. The branch head that is -pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*` -character while other heads are prefixed with a `!` character. + +Given N s, the first N lines are the one-line description from +their commit message. The branch head that is pointed at by +$GIT_DIR/HEAD is prefixed with an asterisk `*` character while other +heads are prefixed with a `!` character. Following these N lines, one-line log for each commit is displayed, indented N places. If a commit is on the I-th diff --git a/git-show-index.html b/git-show-index.html index e7f9367d4..8fae1c11a 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -824,7 +824,7 @@ repositories may change in backwards-incompatible ways. Only use diff --git a/git-show-ref.html b/git-show-ref.html index d52485dc0..ca0877c33 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -765,7 +765,7 @@ commit IDs. Results can be filtered using a pattern and tags can be dereferenced into object IDs. Additionally, it can be used to test whether a particular ref exists.

By default, shows the tags, heads, and remote refs.

-

The --exclude-existing form is a filter that does the inverse. It reads +

The --exclude-existing form is a filter that does the inverse. It reads refs from stdin, one ref per line, and shows those that don’t exist in the local repository.

Use of this utility is encouraged in favor of directly accessing files under @@ -805,7 +805,7 @@ the .git directory.

- Dereference tags into object IDs as well. They will be shown with "^{}" + Dereference tags into object IDs as well. They will be shown with {caret}{} appended.

@@ -817,8 +817,8 @@ the .git directory.

- Only show the SHA-1 hash, not the reference name. When combined with - --dereference the dereferenced tag will still be shown after the SHA-1. + Only show the OID, not the reference name. When combined with + --dereference, the dereferenced tag will still be shown after the OID.

@@ -848,7 +848,7 @@ the .git directory.

- Do not print any results to stdout. When combined with --verify this + Do not print any results to stdout. When combined with --verify, this can be used to silently check if a reference exists.

@@ -857,10 +857,10 @@ the .git directory.

- Make git show-ref act as a filter that reads refs from stdin of the - form "^(?:<anything>\s)?<refname>(?:\^{})?$" + Make git show-ref act as a filter that reads refs from stdin of the + form ^(?:<anything>\s)?<refname>(?:\^{})?$ and performs the following actions on each: - (1) strip "^{}" at the end of line if any; + (1) strip {caret}{} at the end of line if any; (2) ignore if pattern is provided and does not head-match refname; (3) warn if refname is not a well-formed refname and skip; (4) ignore if refname is a ref that exists in the local repository; @@ -885,7 +885,12 @@ the .git directory.

OUTPUT

-

The output is in the format: <SHA-1 ID> <space> <reference name>.

+

The output is in the format:

+
+
+
<oid> SP <ref> LF
+
+

For example,

$ git show-ref --head --dereference
@@ -898,7 +903,12 @@ the .git directory.
423325a2d24638ddcc82ce47be5e40be550f4507 refs/tags/v1.0rc4^{} ...
-

When using --hash (and not --dereference) the output format is: <SHA-1 ID>

+

When using --hash (and not --dereference), the output is in the format:

+
+
+
<oid> LF
+
+

For example,

$ git show-ref --heads --hash
@@ -927,9 +937,9 @@ if such references exists.
        git show-ref --verify refs/heads/master

will only match the exact branch called "master".

-

If nothing matches, git show-ref will return an error code of 1, +

If nothing matches, git show-ref will return an error code of 1, and in the case of verification, it will show an error message.

-

For scripting, you can ask it to be quiet with the "--quiet" flag, which +

For scripting, you can ask it to be quiet with the --quiet flag, which allows you to do things like

@@ -939,10 +949,10 @@ allows you to do things like

to check whether a particular branch exists or not (notice how we don’t actually want to show any results, and we want to use the full refname for it in order to not trigger the problem with ambiguous partial matches).

-

To show only tags, or only proper branch heads, use "--tags" and/or "--heads" +

To show only tags, or only proper branch heads, use --tags and/or --heads respectively (using both means that it shows tags and heads, but not other random references under the refs/ subdirectory).

-

To do automatic tag object dereferencing, use the "-d" or "--dereference" +

To do automatic tag object dereferencing, use the -d or --dereference flag, so you can do

@@ -977,7 +987,7 @@ flag, so you can do

diff --git a/git-show-ref.txt b/git-show-ref.txt index d1d56f68b..44c7387d7 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt @@ -23,7 +23,7 @@ particular ref exists. By default, shows the tags, heads, and remote refs. -The --exclude-existing form is a filter that does the inverse. It reads +The `--exclude-existing` form is a filter that does the inverse. It reads refs from stdin, one ref per line, and shows those that don't exist in the local repository. @@ -47,14 +47,14 @@ OPTIONS -d:: --dereference:: - Dereference tags into object IDs as well. They will be shown with "{caret}{}" + Dereference tags into object IDs as well. They will be shown with `{caret}{}` appended. -s:: --hash[=]:: - Only show the SHA-1 hash, not the reference name. When combined with - --dereference the dereferenced tag will still be shown after the SHA-1. + Only show the OID, not the reference name. When combined with + `--dereference`, the dereferenced tag will still be shown after the OID. --verify:: @@ -70,15 +70,15 @@ OPTIONS -q:: --quiet:: - Do not print any results to stdout. When combined with `--verify` this + Do not print any results to stdout. When combined with `--verify`, this can be used to silently check if a reference exists. --exclude-existing[=]:: - Make 'git show-ref' act as a filter that reads refs from stdin of the - form "`^(?:\s)?(?:\^{})?$`" + Make `git show-ref` act as a filter that reads refs from stdin of the + form `^(?:\s)?(?:\^{})?$` and performs the following actions on each: - (1) strip "{caret}{}" at the end of line if any; + (1) strip `{caret}{}` at the end of line if any; (2) ignore if pattern is provided and does not head-match refname; (3) warn if refname is not a well-formed refname and skip; (4) ignore if refname is a ref that exists in the local repository; @@ -96,7 +96,13 @@ OPTIONS OUTPUT ------ -The output is in the format: '' '' ''. +The output is in the format: + +------------ + SP LF +------------ + +For example, ----------------------------------------------------------------------------- $ git show-ref --head --dereference @@ -110,7 +116,13 @@ $ git show-ref --head --dereference ... ----------------------------------------------------------------------------- -When using --hash (and not --dereference) the output format is: '' +When using `--hash` (and not `--dereference`), the output is in the format: + +------------ + LF +------------ + +For example, ----------------------------------------------------------------------------- $ git show-ref --heads --hash @@ -142,10 +154,10 @@ When using the `--verify` flag, the command requires an exact path: will only match the exact branch called "master". -If nothing matches, 'git show-ref' will return an error code of 1, +If nothing matches, `git show-ref` will return an error code of 1, and in the case of verification, it will show an error message. -For scripting, you can ask it to be quiet with the "--quiet" flag, which +For scripting, you can ask it to be quiet with the `--quiet` flag, which allows you to do things like ----------------------------------------------------------------------------- @@ -157,11 +169,11 @@ to check whether a particular branch exists or not (notice how we don't actually want to show any results, and we want to use the full refname for it in order to not trigger the problem with ambiguous partial matches). -To show only tags, or only proper branch heads, use "--tags" and/or "--heads" +To show only tags, or only proper branch heads, use `--tags` and/or `--heads` respectively (using both means that it shows tags and heads, but not other random references under the refs/ subdirectory). -To do automatic tag object dereferencing, use the "-d" or "--dereference" +To do automatic tag object dereferencing, use the `-d` or `--dereference` flag, so you can do ----------------------------------------------------------------------------- diff --git a/git-show.html b/git-show.html index 212f21fe1..53bd3b1d9 100644 --- a/git-show.html +++ b/git-show.html @@ -1974,8 +1974,10 @@ diff output.

- Suppress diff output. Useful for commands like git show that - show the patch by default, or to cancel the effect of --patch. + Suppress all output from the diff machinery. Useful for + commands like git show that show the patch by default to + squelch their output, or to cancel the effect of options like + --patch, --stat earlier on the command line in an alias.

@@ -3759,7 +3761,7 @@ reversible operation.

diff --git a/git-sparse-checkout.html b/git-sparse-checkout.html index 4558c5fd3..b6ec84be5 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 e401cd67b..204ae39df 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 b74eaf07f..dddd48949 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 ee69e21ce..ef484c6d9 100644 --- a/git-status.html +++ b/git-status.html @@ -1451,7 +1451,7 @@ normal.

diff --git a/git-stripspace.html b/git-stripspace.html index aa65cf6cc..36c2cfe0d 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 2f1d65e5e..a1034c215 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -1410,7 +1410,7 @@ for details.

diff --git a/git-svn.html b/git-svn.html index b52b294c8..26baae2bd 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 bdbe81e45..6106d7415 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 87743c3e7..052bc45f4 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 2b98d1470..59571e6cf 100644 --- a/git-tag.html +++ b/git-tag.html @@ -1320,6 +1320,25 @@ ISO 8601
+

FILES

+
+
+
+$GIT_DIR/TAG_EDITMSG +
+
+

+ This file contains the message of an in-progress annotated + tag. If git tag exits due to an error before creating an + annotated tag then the tag message that has been provided by the + user in an editor session will be available in this file, but + may be overwritten by the next invocation of git tag. +

+
+
+
+
+

NOTES

When combining multiple --contains and --no-contains filters, only @@ -1348,7 +1367,7 @@ commits and from none of the --no-merged commits are shown.

Last updated - 2023-04-22 07:58:28 JST + 2023-06-13 13:57:42 PDT
diff --git a/git-tag.txt b/git-tag.txt index 7f61c1edb..d42efb311 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -381,6 +381,16 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 include::date-formats.txt[] +FILES +----- + +`$GIT_DIR/TAG_EDITMSG`:: + This file contains the message of an in-progress annotated + tag. If `git tag` exits due to an error before creating an + annotated tag then the tag message that has been provided by the + user in an editor session will be available in this file, but + may be overwritten by the next invocation of `git tag`. + NOTES ----- diff --git a/git-unpack-file.html b/git-unpack-file.html index 601312ad5..4e058a94d 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 c96452ff1..da0e9a997 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 ba5cf63b2..8997f1b40 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -1546,7 +1546,7 @@ automatically.

diff --git a/git-update-ref.html b/git-update-ref.html index 075a815b0..4fd37bc7b 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 7ed30e46c..681a5082f 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 7240ffbf7..c60273b05 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 6fd17b46d..c12d89dc4 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 da547738d..a98c49649 100644 --- a/git-var.html +++ b/git-var.html @@ -878,7 +878,7 @@ GIT_DEFAULT_BRANCH diff --git a/git-verify-commit.html b/git-verify-commit.html index 6f5ace1bb..5d96af43f 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 4e8b6da37..3b18d241e 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 c7985cc38..3e1786e1c 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 f0cd99551..689a0e37c 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 35c3a9152..60e675aaf 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 8625a01b1..5f46b7839 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -803,7 +803,7 @@ reading Linux kernel mailing list are trained to type it.

diff --git a/git-worktree.html b/git-worktree.html index 72bbb6a0f..665388379 100644 --- a/git-worktree.html +++ b/git-worktree.html @@ -1380,7 +1380,7 @@ checkouts of a superproject.

diff --git a/git-write-tree.html b/git-write-tree.html index cd1d4499b..49ed13fcd 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 70d8bfb5e..16384e99e 100644 --- a/git.html +++ b/git.html @@ -3814,7 +3814,7 @@ the Git Security mailing list <
Last updated - 2023-05-18 08:02:03 JST + 2023-05-17 16:02:03 PDT
diff --git a/gitattributes.html b/gitattributes.html index c7d825fb5..9fcd7d64c 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -2243,7 +2243,7 @@ frotz unspecified diff --git a/gitcli.html b/gitcli.html index 0d5500724..63e928d3e 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 1f2c8b2b8..8821f1d40 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 5e14ae7a0..cef639fbe 100644 --- a/gitcredentials.html +++ b/gitcredentials.html @@ -1110,7 +1110,7 @@ helpers will just ignore the new requests).

diff --git a/gitcvs-migration.html b/gitcvs-migration.html index a4dbd62d6..2018d1ab9 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 4078cfb4e..48120c50f 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 be16520bc..6863bd515 100644 --- a/giteveryday.html +++ b/giteveryday.html @@ -1546,7 +1546,7 @@ create and push version tags. diff --git a/gitfaq.html b/gitfaq.html index 70aba080d..3ca5875c2 100644 --- a/gitfaq.html +++ b/gitfaq.html @@ -1262,7 +1262,7 @@ platform.

diff --git a/gitformat-bundle.html b/gitformat-bundle.html index f3effc550..59269de6f 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 f88892183..a38231614 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 48084b510..feaa323ed 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-12 16:55:30 JST + 2022-11-11 23:55:30 PST
diff --git a/gitformat-index.html b/gitformat-index.html index 204dd3e81..940ea0cfe 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 718eae467..b2a4385ec 100644 --- a/gitformat-pack.html +++ b/gitformat-pack.html @@ -1595,7 +1595,7 @@ scratch.

diff --git a/gitformat-signature.html b/gitformat-signature.html index 90266d404..da48c3b9e 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 7633c1eec..6d0632f87 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 e02d3ffd4..841c9b84e 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 65748f763..731f7c825 100644 --- a/gitignore.html +++ b/gitignore.html @@ -1073,7 +1073,7 @@ everything within foo/bar):

diff --git a/gitk.html b/gitk.html index 8078bbacc..e185f8985 100644 --- a/gitk.html +++ b/gitk.html @@ -1101,7 +1101,7 @@ of end users.

diff --git a/gitmailmap.html b/gitmailmap.html index 21e042161..0e095185a 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 2d9c2a9f0..810766457 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 df10c2142..5f21d87da 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 de3e511f9..e653f9321 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 a69fb6c90..3bfaab6a9 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 1e6711aad..62f55c8f2 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 964e5991c..0dfa78382 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 3a515d2d0..fcc493150 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 5181b9d62..57b295833 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 498e6ed01..bd1714a54 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 5cc7abb59..737eda12b 100644 --- a/gitrevisions.html +++ b/gitrevisions.html @@ -1343,7 +1343,7 @@ spelt out:

diff --git a/gitsubmodules.html b/gitsubmodules.html index 01fa73159..c98b3c2e1 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 3f6717bad..4be9cc51e 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 ad16f85fe..662c3b9eb 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 d084c11b2..34a32cce9 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 946c9fd6d..0bd2ecb3c 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 e68de91f5..4c63bc675 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 16f60bfdf..62f2a103d 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 3b696b283..a37027f95 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 648ebcc8e..c37381a16 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 7fdfa358f..3f3c2e4b7 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 40672384d..d5f889907 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 e859ee5ba..bf571d654 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 6d7441a8d..9450e9984 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 79f77f77d..6d8ae76d1 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 0654375a5..7bebc1bb7 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 7dc46aec4..2451d2a23 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 1fe732eab..bbc06d99a 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 ba9f8d768..582cfc350 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 8b46d19c8..5e896bb3f 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 aa1daaa0a..736b447d0 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 890d686ff..2a139f1bd 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 65fd13a41..24f08a244 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 f65518f97..c47ab5e65 100644 --- a/scalar.html +++ b/scalar.html @@ -988,7 +988,7 @@ delete <enlistment> diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index eeb34861d..e99d271cf 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 5ed810d70..fd4639252 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 f7c2dd6f1..d54ee5d3d 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 48cb5f307..d8779498c 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 0a5dd3091..ec4a11f10 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 application at hand.

diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 0b0ed23f4..e8cd2d15a 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 cca739ece..a36369950 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 bffa5e4fc..c73d35052 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 9661160fe..4e896ee28 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 6e0fc0c7b..7869fdc36 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 3155fc83f..2cbcc49b5 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 392360c55..650656ceb 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 b0530737f..2d2ec7639 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 d7048be19..8ae58aa65 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 045401816..4e99c8567 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 0b0183824..16c612f24 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 91d39d397..ada717878 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 fea8e356b..fa85f98c2 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 367a80e3e..b8f5e8613 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 16d0eb0bf..27679af9b 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 0cc61cdf4..7d1d7752d 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

Git User Manual

Revision History
2023-06-01

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-06-13

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 -- cgit 1.2.3-korg