From 6596a4a0631912d8524996daaf44bc12c0ace1ca Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 18 Aug 2022 14:13:11 -0700 Subject: Autogenerated manpages for v2.37.2-382-g795ea --- man1/git-add.1 | 8 +- man1/git-am.1 | 13 +- man1/git-annotate.1 | 6 +- man1/git-apply.1 | 6 +- man1/git-archimport.1 | 6 +- man1/git-archive.1 | 6 +- man1/git-bisect.1 | 6 +- man1/git-blame.1 | 6 +- man1/git-branch.1 | 6 +- man1/git-bugreport.1 | 6 +- man1/git-bundle.1 | 27 +- man1/git-cat-file.1 | 6 +- man1/git-check-attr.1 | 6 +- man1/git-check-ignore.1 | 6 +- man1/git-check-mailmap.1 | 6 +- man1/git-check-ref-format.1 | 6 +- man1/git-checkout-index.1 | 6 +- man1/git-checkout.1 | 6 +- man1/git-cherry-pick.1 | 13 +- man1/git-cherry.1 | 6 +- man1/git-citool.1 | 6 +- man1/git-clean.1 | 6 +- man1/git-clone.1 | 6 +- man1/git-column.1 | 6 +- man1/git-commit-graph.1 | 9 +- man1/git-commit-tree.1 | 6 +- man1/git-commit.1 | 6 +- man1/git-config.1 | 26 +- man1/git-count-objects.1 | 6 +- man1/git-credential-cache--daemon.1 | 6 +- man1/git-credential-cache.1 | 6 +- man1/git-credential-store.1 | 6 +- man1/git-credential.1 | 6 +- man1/git-cvsexportcommit.1 | 6 +- man1/git-cvsimport.1 | 6 +- man1/git-cvsserver.1 | 6 +- man1/git-daemon.1 | 6 +- man1/git-describe.1 | 6 +- man1/git-diff-files.1 | 6 +- man1/git-diff-index.1 | 6 +- man1/git-diff-tree.1 | 6 +- man1/git-diff.1 | 6 +- man1/git-difftool.1 | 6 +- man1/git-fast-export.1 | 6 +- man1/git-fast-import.1 | 6 +- man1/git-fetch-pack.1 | 6 +- man1/git-fetch.1 | 6 +- man1/git-filter-branch.1 | 6 +- man1/git-fmt-merge-msg.1 | 6 +- man1/git-for-each-ref.1 | 6 +- man1/git-for-each-repo.1 | 6 +- man1/git-format-patch.1 | 6 +- man1/git-fsck-objects.1 | 6 +- man1/git-fsck.1 | 6 +- man1/git-fsmonitor--daemon.1 | 6 +- man1/git-gc.1 | 6 +- man1/git-get-tar-commit-id.1 | 6 +- man1/git-grep.1 | 6 +- man1/git-gui.1 | 6 +- man1/git-hash-object.1 | 6 +- man1/git-help.1 | 38 +- man1/git-hook.1 | 6 +- man1/git-http-backend.1 | 6 +- man1/git-http-fetch.1 | 6 +- man1/git-http-push.1 | 6 +- man1/git-imap-send.1 | 6 +- man1/git-index-pack.1 | 6 +- man1/git-init-db.1 | 6 +- man1/git-init.1 | 6 +- man1/git-instaweb.1 | 6 +- man1/git-interpret-trailers.1 | 6 +- man1/git-log.1 | 6 +- man1/git-ls-files.1 | 6 +- man1/git-ls-remote.1 | 6 +- man1/git-ls-tree.1 | 6 +- man1/git-mailinfo.1 | 6 +- man1/git-mailsplit.1 | 6 +- man1/git-maintenance.1 | 6 +- man1/git-merge-base.1 | 6 +- man1/git-merge-file.1 | 6 +- man1/git-merge-index.1 | 6 +- man1/git-merge-one-file.1 | 6 +- man1/git-merge-tree.1 | 6 +- man1/git-merge.1 | 13 +- man1/git-mergetool--lib.1 | 6 +- man1/git-mergetool.1 | 6 +- man1/git-mktag.1 | 6 +- man1/git-mktree.1 | 6 +- man1/git-multi-pack-index.1 | 13 +- man1/git-mv.1 | 6 +- man1/git-name-rev.1 | 6 +- man1/git-notes.1 | 6 +- man1/git-p4.1 | 6 +- man1/git-pack-objects.1 | 6 +- man1/git-pack-redundant.1 | 6 +- man1/git-pack-refs.1 | 6 +- man1/git-patch-id.1 | 6 +- man1/git-prune-packed.1 | 6 +- man1/git-prune.1 | 6 +- man1/git-pull.1 | 6 +- man1/git-push.1 | 6 +- man1/git-quiltimport.1 | 6 +- man1/git-range-diff.1 | 6 +- man1/git-read-tree.1 | 6 +- man1/git-rebase.1 | 13 +- man1/git-receive-pack.1 | 6 +- man1/git-reflog.1 | 6 +- man1/git-remote-ext.1 | 6 +- man1/git-remote-fd.1 | 6 +- man1/git-remote.1 | 6 +- man1/git-repack.1 | 6 +- man1/git-replace.1 | 6 +- man1/git-request-pull.1 | 6 +- man1/git-rerere.1 | 6 +- man1/git-reset.1 | 6 +- man1/git-restore.1 | 6 +- man1/git-rev-list.1 | 11 +- man1/git-rev-parse.1 | 6 +- man1/git-revert.1 | 13 +- man1/git-rm.1 | 6 +- man1/git-send-email.1 | 6 +- man1/git-send-pack.1 | 6 +- man1/git-sh-i18n--envsubst.1 | 6 +- man1/git-sh-i18n.1 | 6 +- man1/git-sh-setup.1 | 6 +- man1/git-shell.1 | 6 +- man1/git-shortlog.1 | 6 +- man1/git-show-branch.1 | 6 +- man1/git-show-index.1 | 6 +- man1/git-show-ref.1 | 6 +- man1/git-show.1 | 6 +- man1/git-sparse-checkout.1 | 6 +- man1/git-stage.1 | 6 +- man1/git-stash.1 | 6 +- man1/git-status.1 | 6 +- man1/git-stripspace.1 | 6 +- man1/git-submodule.1 | 6 +- man1/git-svn.1 | 6 +- man1/git-switch.1 | 6 +- man1/git-symbolic-ref.1 | 6 +- man1/git-tag.1 | 6 +- man1/git-unpack-file.1 | 6 +- man1/git-unpack-objects.1 | 6 +- man1/git-update-index.1 | 6 +- man1/git-update-ref.1 | 6 +- man1/git-update-server-info.1 | 6 +- man1/git-upload-archive.1 | 6 +- man1/git-upload-pack.1 | 23 +- man1/git-var.1 | 6 +- man1/git-verify-commit.1 | 6 +- man1/git-verify-pack.1 | 6 +- man1/git-verify-tag.1 | 6 +- man1/git-version.1 | 6 +- man1/git-web--browse.1 | 6 +- man1/git-whatchanged.1 | 6 +- man1/git-worktree.1 | 6 +- man1/git-write-tree.1 | 6 +- man1/git.1 | 119 +++- man1/gitk.1 | 6 +- man1/gitweb.1 | 6 +- man5/gitattributes.5 | 6 +- man5/gitformat-bundle.5 | 178 +++++ man5/gitformat-chunk.5 | 156 ++++ man5/gitformat-commit-graph.5 | 547 ++++++++++++++ man5/gitformat-index.5 | 1339 +++++++++++++++++++++++++++++++++++ man5/gitformat-pack.5 | 1194 +++++++++++++++++++++++++++++++ man5/gitformat-signature.5 | 414 +++++++++++ man5/githooks.5 | 6 +- man5/gitignore.5 | 6 +- man5/gitmailmap.5 | 6 +- man5/gitmodules.5 | 6 +- man5/gitprotocol-capabilities.5 | 230 ++++++ man5/gitprotocol-common.5 | 238 +++++++ man5/gitprotocol-http.5 | 670 ++++++++++++++++++ man5/gitprotocol-pack.5 | 768 ++++++++++++++++++++ man5/gitprotocol-v2.5 | 1102 ++++++++++++++++++++++++++++ man5/gitrepository-layout.5 | 6 +- man5/gitweb.conf.5 | 6 +- man7/gitcli.7 | 6 +- man7/gitcore-tutorial.7 | 6 +- man7/gitcredentials.7 | 6 +- man7/gitcvs-migration.7 | 6 +- man7/gitdiffcore.7 | 6 +- man7/giteveryday.7 | 6 +- man7/gitfaq.7 | 6 +- man7/gitglossary.7 | 6 +- man7/gitnamespaces.7 | 6 +- man7/gitremote-helpers.7 | 6 +- man7/gitrevisions.7 | 6 +- man7/gitsubmodules.7 | 6 +- man7/gittutorial-2.7 | 6 +- man7/gittutorial.7 | 6 +- man7/gitworkflows.7 | 6 +- 193 files changed, 7551 insertions(+), 632 deletions(-) create mode 100644 man5/gitformat-bundle.5 create mode 100644 man5/gitformat-chunk.5 create mode 100644 man5/gitformat-commit-graph.5 create mode 100644 man5/gitformat-index.5 create mode 100644 man5/gitformat-pack.5 create mode 100644 man5/gitformat-signature.5 create mode 100644 man5/gitprotocol-capabilities.5 create mode 100644 man5/gitprotocol-common.5 create mode 100644 man5/gitprotocol-http.5 create mode 100644 man5/gitprotocol-pack.5 create mode 100644 man5/gitprotocol-v2.5 diff --git a/man1/git-add.1 b/man1/git-add.1 index 72d151642..6d5919c4c 100644 --- a/man1/git-add.1 +++ b/man1/git-add.1 @@ -2,12 +2,12 @@ .\" Title: git-add .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 08/12/2022 +.\" Date: 08/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.2.324.gafa70145a2 +.\" Source: Git 2.37.2.382.g795ea8776b .\" Language: English .\" -.TH "GIT\-ADD" "1" "08/12/2022" "Git 2\&.37\&.2\&.324\&.gafa701" "Git Manual" +.TH "GIT\-ADD" "1" "08/18/2022" "Git 2\&.37\&.2\&.382\&.g795ea8" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -193,7 +193,7 @@ Apply the "clean" process freshly to all tracked files to forcibly add them agai configuration or the \fBtext\fR attribute in order to correct files added with wrong CRLF/LF line endings\&. This option implies -\fB\-u\fR\&. +\fB\-u\fR\&. Lone CR characters are untouched, thus while a CRLF cleans to LF, a CRCRLF sequence is only partially cleaned to CRLF\&. .RE .PP \-\-chmod=(+|\-)x diff --git a/man1/git-am.1 b/man1/git-am.1 index 52c3b587a..bd6318752 100644 --- a/man1/git-am.1 +++ b/man1/git-am.1 @@ -2,12 +2,12 @@ .\" Title: git-am .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 08/12/2022 +.\" Date: 08/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.2.324.gafa70145a2 +.\" Source: Git 2.37.2.382.g795ea8776b .\" Language: English .\" -.TH "GIT\-AM" "1" "08/12/2022" "Git 2\&.37\&.2\&.324\&.gafa701" "Git Manual" +.TH "GIT\-AM" "1" "08/18/2022" "Git 2\&.37\&.2\&.382\&.g795ea8" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -188,7 +188,12 @@ can be used to override am\&.threeWay configuration variable\&. For more informa .PP \-\-rerere\-autoupdate, \-\-no\-rerere\-autoupdate .RS 4 -Allow the rerere mechanism to update the index with the result of auto\-conflict resolution if possible\&. +After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution\&. +\fB\-\-no\-rerere\-autoupdate\fR +is a good way to double\-check what +\fBrerere\fR +did and catch potential mismerges, before committing the result to the index with a separate +\fBgit add\fR\&. .RE .PP \-\-ignore\-space\-change, \-\-ignore\-whitespace, \-\-whitespace=