From df931e33a6664f73e795f6bb5b2176f49818c143 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Sep 2022 13:25:26 -0700 Subject: Autogenerated manpages for v2.37.3-662-g36f8e7e --- man1/git-add.1 | 32 ++- man1/git-am.1 | 35 ++- man1/git-annotate.1 | 6 +- man1/git-apply.1 | 27 ++- man1/git-archimport.1 | 6 +- man1/git-archive.1 | 6 +- man1/git-bisect.1 | 6 +- man1/git-blame.1 | 70 +++++- man1/git-branch.1 | 140 ++++++++++- man1/git-bugreport.1 | 6 +- man1/git-bundle.1 | 6 +- 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 | 67 +++++- man1/git-cherry-pick.1 | 6 +- man1/git-cherry.1 | 6 +- man1/git-citool.1 | 6 +- man1/git-clean.1 | 14 +- man1/git-clone.1 | 47 +++- man1/git-column.1 | 104 +++++++- man1/git-commit-graph.1 | 31 ++- man1/git-commit-tree.1 | 6 +- man1/git-commit.1 | 46 +++- man1/git-config.1 | 210 +++++++++++++--- 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-diagnose.1 | 6 +- man1/git-diff-files.1 | 6 +- man1/git-diff-index.1 | 6 +- man1/git-diff-tree.1 | 6 +- man1/git-diff.1 | 460 +++++++++++++++++++++++++++++++++++- man1/git-difftool.1 | 49 ++-- man1/git-fast-export.1 | 6 +- man1/git-fast-import.1 | 18 +- man1/git-fetch-pack.1 | 6 +- man1/git-fetch.1 | 147 +++++++++++- 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 | 8 +- man1/git-fsmonitor--daemon.1 | 6 +- man1/git-gc.1 | 8 +- man1/git-get-tar-commit-id.1 | 6 +- man1/git-grep.1 | 15 +- man1/git-gui.1 | 6 +- man1/git-hash-object.1 | 6 +- man1/git-help.1 | 6 +- 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 | 8 +- man1/git-index-pack.1 | 6 +- man1/git-init-db.1 | 6 +- man1/git-init.1 | 20 +- man1/git-instaweb.1 | 6 +- man1/git-interpret-trailers.1 | 6 +- man1/git-log.1 | 209 +++++++++++++--- man1/git-ls-files.1 | 6 +- man1/git-ls-remote.1 | 6 +- man1/git-ls-tree.1 | 6 +- man1/git-mailinfo.1 | 17 +- man1/git-mailsplit.1 | 6 +- man1/git-maintenance.1 | 124 +++++++++- 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 | 20 +- man1/git-mergetool--lib.1 | 6 +- man1/git-mergetool.1 | 8 +- man1/git-mktag.1 | 6 +- man1/git-mktree.1 | 6 +- man1/git-multi-pack-index.1 | 6 +- man1/git-mv.1 | 6 +- man1/git-name-rev.1 | 6 +- man1/git-notes.1 | 54 +++-- 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 | 229 +++++++++++++++++- man1/git-quiltimport.1 | 6 +- man1/git-range-diff.1 | 6 +- man1/git-read-tree.1 | 6 +- man1/git-rebase.1 | 8 +- 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 | 6 +- man1/git-rev-parse.1 | 6 +- man1/git-revert.1 | 18 +- man1/git-rm.1 | 6 +- man1/git-send-email.1 | 108 +++++++-- 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 | 16 +- 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 | 39 ++- man1/git-status.1 | 6 +- man1/git-stripspace.1 | 6 +- man1/git-submodule.1 | 6 +- man1/git-svn.1 | 6 +- man1/git-switch.1 | 67 +++++- 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 | 6 +- 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 | 6 +- man1/gitk.1 | 6 +- man1/gitweb.1 | 6 +- man5/gitattributes.5 | 6 +- man5/gitformat-bundle.5 | 6 +- man5/gitformat-chunk.5 | 6 +- man5/gitformat-commit-graph.5 | 6 +- man5/gitformat-index.5 | 6 +- man5/gitformat-pack.5 | 6 +- man5/gitformat-signature.5 | 6 +- man5/githooks.5 | 6 +- man5/gitignore.5 | 6 +- man5/gitmailmap.5 | 6 +- man5/gitmodules.5 | 6 +- man5/gitprotocol-capabilities.5 | 6 +- man5/gitprotocol-common.5 | 6 +- man5/gitprotocol-http.5 | 6 +- man5/gitprotocol-pack.5 | 6 +- man5/gitprotocol-v2.5 | 6 +- 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 +- 194 files changed, 2736 insertions(+), 697 deletions(-) diff --git a/man1/git-add.1 b/man1/git-add.1 index 74cb96c52..24769ec5d 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: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-ADD" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-ADD" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -500,6 +500,32 @@ deleting context or removal lines .\} modifying the contents of context or removal lines .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +add\&.ignoreErrors, add\&.ignore\-errors (deprecated) +.RS 4 +Tells +\fIgit add\fR +to continue adding files when some files cannot be added due to indexing errors\&. Equivalent to the +\fB\-\-ignore\-errors\fR +option of +\fBgit-add\fR(1)\&. +\fBadd\&.ignore\-errors\fR +is deprecated, as it does not follow the usual naming convention for configuration variables\&. +.RE +.PP +add\&.interactive\&.useBuiltin +.RS 4 +Set to +\fBfalse\fR +to fall back to the original Perl implementation of the interactive version of +\fBgit-add\fR(1) +instead of the built\-in version\&. Is +\fBtrue\fR +by default\&. +.RE .SH "SEE ALSO" .sp \fBgit-status\fR(1) \fBgit-rm\fR(1) \fBgit-reset\fR(1) \fBgit-mv\fR(1) \fBgit-commit\fR(1) \fBgit-update-index\fR(1) diff --git a/man1/git-am.1 b/man1/git-am.1 index dd3c0f366..21009cab0 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: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-AM" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-AM" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -362,6 +362,35 @@ Before any patches are applied, ORIG_HEAD is set to the tip of the current branc .SH "HOOKS" .sp This command can run \fBapplypatch\-msg\fR, \fBpre\-applypatch\fR, and \fBpost\-applypatch\fR hooks\&. See \fBgithooks\fR(5) for more information\&. +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +am\&.keepcr +.RS 4 +If true, git\-am will call git\-mailsplit for patches in mbox format with parameter +\fB\-\-keep\-cr\fR\&. In this case git\-mailsplit will not remove +\fB\er\fR +from lines ending with +\fB\er\en\fR\&. Can be overridden by giving +\fB\-\-no\-keep\-cr\fR +from the command line\&. See +\fBgit-am\fR(1), +\fBgit-mailsplit\fR(1)\&. +.RE +.PP +am\&.threeWay +.RS 4 +By default, +\fBgit am\fR +will fail if the patch does not apply cleanly\&. When set to true, this setting tells +\fBgit am\fR +to fall back on 3\-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally (equivalent to giving the +\fB\-\-3way\fR +option from the command line)\&. Defaults to +\fBfalse\fR\&. See +\fBgit-am\fR(1)\&. +.RE .SH "SEE ALSO" .sp \fBgit-apply\fR(1)\&. diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index 215ab2ffd..b31f35bc1 100644 --- a/man1/git-annotate.1 +++ b/man1/git-annotate.1 @@ -2,12 +2,12 @@ .\" Title: git-annotate .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 52f03f0bb..acf46bdc7 100644 --- a/man1/git-apply.1 +++ b/man1/git-apply.1 @@ -2,12 +2,12 @@ .\" Title: git-apply .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-APPLY" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-APPLY" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -366,19 +366,30 @@ is in use\&. Don\(cqt return error for patches containing no diff\&. This includes empty patches and patches with commit text only\&. .RE .SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP apply\&.ignoreWhitespace .RS 4 -Set to -\fIchange\fR -if you want changes in whitespace to be ignored by default\&. Set to one of: no, none, never, false if you want changes in whitespace to be significant\&. +When set to +\fIchange\fR, tells +\fIgit apply\fR +to ignore changes in whitespace, in the same way as the +\fB\-\-ignore\-space\-change\fR +option\&. When set to one of: no, none, never, false tells +\fIgit apply\fR +to respect all whitespace differences\&. See +\fBgit-apply\fR(1)\&. .RE .PP apply\&.whitespace .RS 4 -When no +Tells +\fIgit apply\fR +how to handle whitespaces, in the same way as the \fB\-\-whitespace\fR -flag is given from the command line, this configuration item is used as the default\&. +option\&. See +\fBgit-apply\fR(1)\&. .RE .SH "SUBMODULES" .sp diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index 7d758ae31..d69a08ca0 100644 --- a/man1/git-archimport.1 +++ b/man1/git-archimport.1 @@ -2,12 +2,12 @@ .\" Title: git-archimport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 0ab9c7e2d..c7eae8644 100644 --- a/man1/git-archive.1 +++ b/man1/git-archive.1 @@ -2,12 +2,12 @@ .\" Title: git-archive .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index f5907ffd8..74e8851c9 100644 --- a/man1/git-bisect.1 +++ b/man1/git-bisect.1 @@ -2,12 +2,12 @@ .\" Title: git-bisect .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-BISECT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-BISECT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index 1006e1911..1872ed399 100644 --- a/man1/git-blame.1 +++ b/man1/git-blame.1 @@ -2,12 +2,12 @@ .\" Title: git-blame .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-BLAME" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-BLAME" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -661,6 +661,70 @@ For people who do parsing: to make it more robust, just ignore any lines between .SH "MAPPING AUTHORS" .sp See \fBgitmailmap\fR(5)\&. +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +blame\&.blankBoundary +.RS 4 +Show blank commit object name for boundary commits in +\fBgit-blame\fR(1)\&. This option defaults to false\&. +.RE +.PP +blame\&.coloring +.RS 4 +This determines the coloring scheme to be applied to blame output\&. It can be +\fIrepeatedLines\fR, +\fIhighlightRecent\fR, or +\fInone\fR +which is the default\&. +.RE +.PP +blame\&.date +.RS 4 +Specifies the format used to output dates in +\fBgit-blame\fR(1)\&. If unset the iso format is used\&. For supported values, see the discussion of the +\fB\-\-date\fR +option at +\fBgit-log\fR(1)\&. +.RE +.PP +blame\&.showEmail +.RS 4 +Show the author email instead of author name in +\fBgit-blame\fR(1)\&. This option defaults to false\&. +.RE +.PP +blame\&.showRoot +.RS 4 +Do not treat root commits as boundaries in +\fBgit-blame\fR(1)\&. This option defaults to false\&. +.RE +.PP +blame\&.ignoreRevsFile +.RS 4 +Ignore revisions listed in the file, one unabbreviated object name per line, in +\fBgit-blame\fR(1)\&. Whitespace and comments beginning with +\fB#\fR +are ignored\&. This option may be repeated multiple times\&. Empty file names will reset the list of ignored revisions\&. This option will be handled before the command line option +\fB\-\-ignore\-revs\-file\fR\&. +.RE +.PP +blame\&.markUnblamableLines +.RS 4 +Mark lines that were changed by an ignored revision that we could not attribute to another commit with a +\fI*\fR +in the output of +\fBgit-blame\fR(1)\&. +.RE +.PP +blame\&.markIgnoredLines +.RS 4 +Mark lines that were changed by an ignored revision that we attributed to another commit with a +\fI?\fR +in the output of +\fBgit-blame\fR(1)\&. +.RE .SH "SEE ALSO" .sp \fBgit-annotate\fR(1) diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 529b15a86..a70cdb3b5 100644 --- a/man1/git-branch.1 +++ b/man1/git-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-branch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-BRANCH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -409,6 +409,140 @@ from a branch ref being shown and the object it points at\&. The format is the s .SH "CONFIGURATION" .sp \fBpager\&.branch\fR is only respected when listing branches, i\&.e\&., when \fB\-\-list\fR is used or implied\&. The default is to use a pager\&. See \fBgit-config\fR(1)\&. +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: +.PP +branch\&.autoSetupMerge +.RS 4 +Tells +\fIgit branch\fR, +\fIgit switch\fR +and +\fIgit checkout\fR +to set up new branches so that +\fBgit-pull\fR(1) +will appropriately merge from the starting point branch\&. Note that even if this option is not set, this behavior can be chosen per\-branch using the +\fB\-\-track\fR +and +\fB\-\-no\-track\fR +options\&. The valid settings are: +\fBfalse\fR \(em no automatic setup is done; +\fBtrue\fR \(em automatic setup is done when the starting point is a remote\-tracking branch; +\fBalways\fR \(em automatic setup is done when the starting point is either a local branch or remote\-tracking branch; +\fBinherit\fR \(em if the starting point has a tracking configuration, it is copied to the new branch; +\fBsimple\fR \(em automatic setup is done only when the starting point is a remote\-tracking branch and the new branch has the same name as the remote branch\&. This option defaults to true\&. +.RE +.PP +branch\&.autoSetupRebase +.RS 4 +When a new branch is created with +\fIgit branch\fR, +\fIgit switch\fR +or +\fIgit checkout\fR +that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see "branch\&.\&.rebase")\&. When +\fBnever\fR, rebase is never automatically set to true\&. When +\fBlocal\fR, rebase is set to true for tracked branches of other local branches\&. When +\fBremote\fR, rebase is set to true for tracked branches of remote\-tracking branches\&. When +\fBalways\fR, rebase will be set to true for all tracking branches\&. See "branch\&.autoSetupMerge" for details on how to set up a branch to track another branch\&. This option defaults to never\&. +.RE +.PP +branch\&.sort +.RS 4 +This variable controls the sort ordering of branches when displayed by +\fBgit-branch\fR(1)\&. Without the "\-\-sort=" option provided, the value of this variable will be used as the default\&. See +\fBgit-for-each-ref\fR(1) +field names for valid values\&. +.RE +.PP +branch\&.\&.remote +.RS 4 +When on branch , it tells +\fIgit fetch\fR +and +\fIgit push\fR +which remote to fetch from/push to\&. The remote to push to may be overridden with +\fBremote\&.pushDefault\fR +(for all branches)\&. The remote to push to, for the current branch, may be further overridden by +\fBbranch\&.\&.pushRemote\fR\&. If no remote is configured, or if you are not on any branch and there is more than one remote defined in the repository, it defaults to +\fBorigin\fR +for fetching and +\fBremote\&.pushDefault\fR +for pushing\&. Additionally, +\fB\&.\fR +(a period) is the current local repository (a dot\-repository), see +\fBbranch\&.\&.merge\fR\(aqs final note below\&. +.RE +.PP +branch\&.\&.pushRemote +.RS 4 +When on branch , it overrides +\fBbranch\&.\&.remote\fR +for pushing\&. It also overrides +\fBremote\&.pushDefault\fR +for pushing from branch \&. When you pull from one place (e\&.g\&. your upstream) and push to another place (e\&.g\&. your own publishing repository), you would want to set +\fBremote\&.pushDefault\fR +to specify the remote to push to for all branches, and use this option to override it for a specific branch\&. +.RE +.PP +branch\&.\&.merge +.RS 4 +Defines, together with branch\&.\&.remote, the upstream branch for the given branch\&. It tells +\fIgit fetch\fR/\fIgit pull\fR/\fIgit rebase\fR +which branch to merge and can also affect +\fIgit push\fR +(see push\&.default)\&. When in branch , it tells +\fIgit fetch\fR +the default refspec to be marked for merging in FETCH_HEAD\&. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by "branch\&.\&.remote"\&. The merge information is used by +\fIgit pull\fR +(which at first calls +\fIgit fetch\fR) to lookup the default branch for merging\&. Without this option, +\fIgit pull\fR +defaults to merge the first refspec fetched\&. Specify multiple values to get an octopus merge\&. If you wish to setup +\fIgit pull\fR +so that it merges into from another branch in the local repository, you can point branch\&.\&.merge to the desired branch, and use the relative path setting +\fB\&.\fR +(a period) for branch\&.\&.remote\&. +.RE +.PP +branch\&.\&.mergeOptions +.RS 4 +Sets default options for merging into branch \&. The syntax and supported options are the same as those of +\fBgit-merge\fR(1), but option values containing whitespace characters are currently not supported\&. +.RE +.PP +branch\&.\&.rebase +.RS 4 +When true, rebase the branch on top of the fetched branch, instead of merging the default branch from the default remote when "git pull" is run\&. See "pull\&.rebase" for doing this in a non branch\-specific manner\&. +.sp +When +\fBmerges\fR +(or just +\fIm\fR), pass the +\fB\-\-rebase\-merges\fR +option to +\fIgit rebase\fR +so that the local merge commits are included in the rebase (see +\fBgit-rebase\fR(1) +for details)\&. +.sp +When the value is +\fBinteractive\fR +(or just +\fIi\fR), the rebase is run in interactive mode\&. +.sp +\fBNOTE\fR: this is a possibly dangerous operation; do +\fBnot\fR +use it unless you understand the implications (see +\fBgit-rebase\fR(1) +for details)\&. +.RE +.PP +branch\&.\&.description +.RS 4 +Branch description, can be edited with +\fBgit branch \-\-edit\-description\fR\&. Branch description is automatically added in the format\-patch cover letter or request\-pull summary\&. +.RE .SH "EXAMPLES" .PP Start development from a known tag diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index 80c7bc2d8..04c3d71fc 100644 --- a/man1/git-bugreport.1 +++ b/man1/git-bugreport.1 @@ -2,12 +2,12 @@ .\" Title: git-bugreport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index 9549f3643..fc8b0a63e 100644 --- a/man1/git-bundle.1 +++ b/man1/git-bundle.1 @@ -2,12 +2,12 @@ .\" Title: git-bundle .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-BUNDLE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index 036d56ec0..458781fce 100644 --- a/man1/git-cat-file.1 +++ b/man1/git-cat-file.1 @@ -2,12 +2,12 @@ .\" Title: git-cat-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 4986af565..61773d978 100644 --- a/man1/git-check-attr.1 +++ b/man1/git-check-attr.1 @@ -2,12 +2,12 @@ .\" Title: git-check-attr .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index 617780353..d43ed7fde 100644 --- a/man1/git-check-ignore.1 +++ b/man1/git-check-ignore.1 @@ -2,12 +2,12 @@ .\" Title: git-check-ignore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index a2dfee2d8..223fec0c5 100644 --- a/man1/git-check-mailmap.1 +++ b/man1/git-check-mailmap.1 @@ -2,12 +2,12 @@ .\" Title: git-check-mailmap .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 2ce2f3189..55f8906eb 100644 --- a/man1/git-check-ref-format.1 +++ b/man1/git-check-ref-format.1 @@ -2,12 +2,12 @@ .\" Title: git-check-ref-format .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FOR" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHECK\-REF\-FOR" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 1dd87de5b..b050aaea2 100644 --- a/man1/git-checkout-index.1 +++ b/man1/git-checkout-index.1 @@ -2,12 +2,12 @@ .\" Title: git-checkout-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index f721235d5..357053e03 100644 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.1 @@ -2,12 +2,12 @@ .\" Title: git-checkout .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -896,6 +896,67 @@ $ git add frotz .\} .sp .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +checkout\&.defaultRemote +.RS 4 +When you run +\fBgit checkout \fR +or +\fBgit switch \fR +and only have one remote, it may implicitly fall back on checking out and tracking e\&.g\&. +\fBorigin/\fR\&. This stops working as soon as you have more than one remote with a +\fB\fR +reference\&. This setting allows for setting the name of a preferred remote that should always win when it comes to disambiguation\&. The typical use\-case is to set this to +\fBorigin\fR\&. +.sp +Currently this is used by +\fBgit-switch\fR(1) +and +\fBgit-checkout\fR(1) +when +\fBgit checkout \fR +or +\fBgit switch \fR +will checkout the +\fB\fR +branch on another remote, and by +\fBgit-worktree\fR(1) +when +\fBgit worktree add\fR +refers to a remote branch\&. This setting might be used for other checkout\-like commands or functionality in the future\&. +.RE +.PP +checkout\&.guess +.RS 4 +Provides the default value for the +\fB\-\-guess\fR +or +\fB\-\-no\-guess\fR +option in +\fBgit checkout\fR +and +\fBgit switch\fR\&. See +\fBgit-switch\fR(1) +and +\fBgit-checkout\fR(1)\&. +.RE +.PP +checkout\&.workers +.RS 4 +The number of parallel workers to use when updating the working tree\&. The default is one, i\&.e\&. sequential execution\&. If set to a value less than one, Git will use as many workers as the number of logical cores available\&. This setting and +\fBcheckout\&.thresholdForParallelism\fR +affect all commands that perform checkout\&. E\&.g\&. checkout, clone, reset, sparse\-checkout, etc\&. +.sp +Note: parallel checkout usually delivers better performance for repositories located on SSDs or over NFS\&. For repositories on spinning disks and/or machines with a small number of cores, the default sequential checkout often performs better\&. The size and compression level of a repository might also influence how well the parallel version performs\&. +.RE +.PP +checkout\&.thresholdForParallelism +.RS 4 +When running parallel checkout with a small number of files, the cost of subprocess spawning and inter\-process communication might outweigh the parallelization gains\&. This setting allows to define the minimum number of files for which parallel checkout should be attempted\&. The default is 100\&. +.RE .SH "SEE ALSO" .sp \fBgit-switch\fR(1), \fBgit-restore\fR(1) diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 1531c9072..69f03e5b5 100644 --- a/man1/git-cherry-pick.1 +++ b/man1/git-cherry-pick.1 @@ -2,12 +2,12 @@ .\" Title: git-cherry-pick .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index dfba9855a..7b6c0e9de 100644 --- a/man1/git-cherry.1 +++ b/man1/git-cherry.1 @@ -2,12 +2,12 @@ .\" Title: git-cherry .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CHERRY" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index 005c84207..17bbcf824 100644 --- a/man1/git-citool.1 +++ b/man1/git-citool.1 @@ -2,12 +2,12 @@ .\" Title: git-citool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CITOOL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index d04e15e34..1f2107f0f 100644 --- a/man1/git-clean.1 +++ b/man1/git-clean.1 @@ -2,12 +2,12 @@ .\" Title: git-clean .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CLEAN" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -150,6 +150,14 @@ help .RS 4 Show brief usage of interactive git\-clean\&. .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +clean\&.requireForce +.RS 4 +A boolean to make git\-clean do nothing unless given \-f, \-i or \-n\&. Defaults to true\&. +.RE .SH "SEE ALSO" .sp \fBgitignore\fR(5) diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 98c5b4b79..e93c9c080 100644 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -2,12 +2,12 @@ .\" Title: git-clone .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CLONE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CLONE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -695,6 +695,47 @@ $ git clone \-\-bare \-l /home/proj/\&.git /pub/scm/proj\&.git .\} .sp .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +init\&.templateDir +.RS 4 +Specify the directory from which templates will be copied\&. (See the "TEMPLATE DIRECTORY" section of +\fBgit-init\fR(1)\&.) +.RE +.PP +init\&.defaultBranch +.RS 4 +Allows overriding the default branch name e\&.g\&. when initializing a new repository\&. +.RE +.PP +clone\&.defaultRemoteName +.RS 4 +The name of the remote to create when cloning a repository\&. Defaults to +\fBorigin\fR, and can be overridden by passing the +\fB\-\-origin\fR +command\-line option to +\fBgit-clone\fR(1)\&. +.RE +.PP +clone\&.rejectShallow +.RS 4 +Reject to clone a repository if it is a shallow one, can be overridden by passing option +\fB\-\-reject\-shallow\fR +in command line\&. See +\fBgit-clone\fR(1) +.RE +.PP +clone\&.filterSubmodules +.RS 4 +If a partial clone filter is provided (see +\fB\-\-filter\fR +in +\fBgit-rev-list\fR(1)) and +\fB\-\-recurse\-submodules\fR +is used, also apply the filter to submodules\&. +.RE .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-column.1 b/man1/git-column.1 index 819b995a1..c75fbafb8 100644 --- a/man1/git-column.1 +++ b/man1/git-column.1 @@ -2,12 +2,12 @@ .\" Title: git-column .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-COLUMN" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -128,6 +128,104 @@ v2\&.4\&.8 v2\&.4\&.9 .RE .\} .sp +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +column\&.ui +.RS 4 +Specify whether supported commands should output in columns\&. This variable consists of a list of tokens separated by spaces or commas: +.sp +These options control when the feature should be enabled (defaults to +\fInever\fR): +.PP +\fBalways\fR +.RS 4 +always show in columns +.RE +.PP +\fBnever\fR +.RS 4 +never show in columns +.RE +.PP +\fBauto\fR +.RS 4 +show in columns if the output is to the terminal +.RE +.sp +These options control layout (defaults to +\fIcolumn\fR)\&. Setting any of these implies +\fIalways\fR +if none of +\fIalways\fR, +\fInever\fR, or +\fIauto\fR +are specified\&. +.PP +\fBcolumn\fR +.RS 4 +fill columns before rows +.RE +.PP +\fBrow\fR +.RS 4 +fill rows before columns +.RE +.PP +\fBplain\fR +.RS 4 +show in one column +.RE +.sp +Finally, these options can be combined with a layout option (defaults to +\fInodense\fR): +.PP +\fBdense\fR +.RS 4 +make unequal size columns to utilize more space +.RE +.PP +\fBnodense\fR +.RS 4 +make equal size columns +.RE +.RE +.PP +column\&.branch +.RS 4 +Specify whether to output branch listing in +\fBgit branch\fR +in columns\&. See +\fBcolumn\&.ui\fR +for details\&. +.RE +.PP +column\&.clean +.RS 4 +Specify the layout when list items in +\fBgit clean \-i\fR, which always shows files and directories in columns\&. See +\fBcolumn\&.ui\fR +for details\&. +.RE +.PP +column\&.status +.RS 4 +Specify whether to output untracked files in +\fBgit status\fR +in columns\&. See +\fBcolumn\&.ui\fR +for details\&. +.RE +.PP +column\&.tag +.RS 4 +Specify whether to output tag listing in +\fBgit tag\fR +in columns\&. See +\fBcolumn\&.ui\fR +for details\&. +.RE .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index 0da11de6c..41f85b9c7 100644 --- a/man1/git-commit-graph.1 +++ b/man1/git-commit-graph.1 @@ -2,12 +2,12 @@ .\" Title: git-commit-graph .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -283,6 +283,31 @@ $ git rev\-parse HEAD | git commit\-graph write \-\-stdin\-commits \-\-append .\} .sp .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +commitGraph\&.generationVersion +.RS 4 +Specifies the type of generation number version to use when writing or reading the commit\-graph file\&. If version 1 is specified, then the corrected commit dates will not be written or read\&. Defaults to 2\&. +.RE +.PP +commitGraph\&.maxNewFilters +.RS 4 +Specifies the default value for the +\fB\-\-max\-new\-filters\fR +option of +\fBgit commit\-graph write\fR +(c\&.f\&., +\fBgit-commit-graph\fR(1))\&. +.RE +.PP +commitGraph\&.readChangedPaths +.RS 4 +If true, then git will use the changed\-path Bloom filters in the commit\-graph file (if it exists, and they are present)\&. Defaults to true\&. See +\fBgit-commit-graph\fR(1) +for more information\&. +.RE .SH "FILE FORMAT" .sp see \fBgitformat-commit-graph\fR(5)\&. diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 1b782cd2f..a72af6e4e 100644 --- a/man1/git-commit-tree.1 +++ b/man1/git-commit-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-commit-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 3f6f17f67..807e9c10f 100644 --- a/man1/git-commit.1 +++ b/man1/git-commit.1 @@ -2,12 +2,12 @@ .\" Title: git-commit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-COMMIT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -910,6 +910,46 @@ Note that we deliberately chose not to re\-code the commit log message when a co .SH "ENVIRONMENT AND CONFIGURATION VARIABLES" .sp The editor used to edit the commit log message will be chosen from the \fBGIT_EDITOR\fR environment variable, the core\&.editor configuration variable, the \fBVISUAL\fR environment variable, or the \fBEDITOR\fR environment variable (in that order)\&. See \fBgit-var\fR(1) for details\&. +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: +.PP +commit\&.cleanup +.RS 4 +This setting overrides the default of the +\fB\-\-cleanup\fR +option in +\fBgit commit\fR\&. See +\fBgit-commit\fR(1) +for details\&. Changing the default can be useful when you always want to keep lines that begin with comment character +\fB#\fR +in your log message, in which case you would do +\fBgit config commit\&.cleanup whitespace\fR +(note that you will have to remove the help lines that begin with +\fB#\fR +in the commit log template yourself, if you do this)\&. +.RE +.PP +commit\&.gpgSign +.RS 4 +A boolean to specify whether all commits should be GPG signed\&. Use of this option when doing operations such as rebase can result in a large number of commits being signed\&. It may be convenient to use an agent to avoid typing your GPG passphrase several times\&. +.RE +.PP +commit\&.status +.RS 4 +A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit message\&. Defaults to true\&. +.RE +.PP +commit\&.template +.RS 4 +Specify the pathname of a file to use as the template for new commit messages\&. +.RE +.PP +commit\&.verbose +.RS 4 +A boolean or int to specify the level of verbose with +\fBgit commit\fR\&. See +\fBgit-commit\fR(1)\&. +.RE .SH "HOOKS" .sp This command can run \fBcommit\-msg\fR, \fBprepare\-commit\-msg\fR, \fBpre\-commit\fR, \fBpost\-commit\fR and \fBpost\-rewrite\fR hooks\&. See \fBgithooks\fR(5) for more information\&. diff --git a/man1/git-config.1 b/man1/git-config.1 index fcff4a02f..38340724b 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,12 +2,12 @@ .\" Title: git-config .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CONFIG" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -3940,21 +3940,6 @@ diff\&.\&.cachetextconv Set this option to true to make the diff driver cache the text conversion outputs\&. See \fBgitattributes\fR(5) for details\&. -.RE -.PP -diff\&.tool -.RS 4 -Controls which diff tool is used by -\fBgit-difftool\fR(1)\&. This variable overrides the value configured in -\fBmerge\&.tool\fR\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom diff tool and requires that a corresponding difftool\&.\&.cmd variable is defined\&. -.RE -.PP -diff\&.guitool -.RS 4 -Controls which diff tool is used by -\fBgit-difftool\fR(1) -when the \-g/\-\-gui flag is specified\&. This variable overrides the value configured in -\fBmerge\&.guitool\fR\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom diff tool and requires that a corresponding difftool\&.\&.cmd variable is defined\&. .PP \fBaraxis\fR .RS 4 @@ -4153,9 +4138,19 @@ in \fBgit-diff\fR(1)\&. .RE .PP -difftool\&.\&.path +diff\&.tool .RS 4 -Override the path for the given tool\&. This is useful in case your tool is not in the PATH\&. +Controls which diff tool is used by +\fBgit-difftool\fR(1)\&. This variable overrides the value configured in +\fBmerge\&.tool\fR\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom diff tool and requires that a corresponding difftool\&.\&.cmd variable is defined\&. +.RE +.PP +diff\&.guitool +.RS 4 +Controls which diff tool is used by +\fBgit-difftool\fR(1) +when the \-g/\-\-gui flag is specified\&. This variable overrides the value configured in +\fBmerge\&.guitool\fR\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom diff tool and requires that a corresponding difftool\&.\&.cmd variable is defined\&. .RE .PP difftool\&.\&.cmd @@ -4165,6 +4160,28 @@ Specify the command to invoke the specified diff tool\&. The specified command i is set to the name of the temporary file containing the contents of the diff pre\-image and \fIREMOTE\fR is set to the name of the temporary file containing the contents of the diff post\-image\&. +.sp +See the +\fB\-\-tool=\fR +option in +\fBgit-difftool\fR(1) +for more details\&. +.RE +.PP +difftool\&.\&.path +.RS 4 +Override the path for the given tool\&. This is useful in case your tool is not in the PATH\&. +.RE +.PP +difftool\&.trustExitCode +.RS 4 +Exit difftool if the invoked diff tool returns a non\-zero exit status\&. +.sp +See the +\fB\-\-trust\-exit\-code\fR +option in +\fBgit-difftool\fR(1) +for more details\&. .RE .PP difftool\&.prompt @@ -5088,11 +5105,14 @@ option is set to a value other than .PP grep\&.threads .RS 4 -Number of grep worker threads to use\&. See -\fBgrep\&.threads\fR -in -\fBgit-grep\fR(1) -for more information\&. +Number of grep worker threads to use\&. If unset (or set to 0), Git will use as many threads as the number of logical cores available\&. +.RE +.PP +grep\&.fullName +.RS 4 +If set to true, enable +\fB\-\-full\-name\fR +option by default\&. .RE .PP grep\&.fallbackToNoIndex @@ -6264,6 +6284,8 @@ command\&. Setting a value for log\&.date is similar to using option\&. See \fBgit-log\fR(1) for details\&. +.sp +If the format is set to "auto:foo" and the pager is in use, format "foo" will be the used for the date format\&. Otherwise "default" will be used\&. .RE .PP log\&.decorate @@ -7004,6 +7026,11 @@ Which merge strategy to choose by default when resolving notes conflicts\&. Must \fBmanual\fR\&. See "NOTES MERGE STRATEGIES" section of \fBgit-notes\fR(1) for more information on each strategy\&. +.sp +This setting can be overridden by passing the +\fB\-\-strategy\fR +option to +\fBgit-notes\fR(1)\&. .RE .PP notes\&.\&.mergeStrategy @@ -7015,12 +7042,27 @@ for more information on the available strategies\&. .PP notes\&.displayRef .RS 4 -The (fully qualified) refname from which to show notes when showing commit messages\&. The value of this variable can be set to a glob, in which case notes from all matching refs will be shown\&. You may also specify this configuration variable several times\&. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&. +Which ref (or refs, if a glob or specified more than once), in addition to the default set by +\fBcore\&.notesRef\fR +or +\fBGIT_NOTES_REF\fR, to read notes from when showing commit messages with the +\fIgit log\fR +family of commands\&. .sp This setting can be overridden with the \fBGIT_NOTES_DISPLAY_REF\fR environment variable, which must be a colon separated list of refs or globs\&. .sp +A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&. +.sp +This setting can be disabled by the +\fB\-\-no\-notes\fR +option to the +\fIgit log\fR +family of commands, or by the +\fB\-\-notes=\fR +option accepted by those commands\&. +.sp The effective value of "core\&.notesRef" (possibly overridden by GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed\&. .RE .PP @@ -7029,9 +7071,13 @@ notes\&.rewrite\&. When rewriting commits with (currently \fBamend\fR or -\fBrebase\fR) and this variable is set to -\fBtrue\fR, Git automatically copies your notes from the original to the rewritten commit\&. Defaults to -\fBtrue\fR, but see "notes\&.rewriteRef" below\&. +\fBrebase\fR), if this variable is +\fBfalse\fR, git will not copy notes from the original to the rewritten commit\&. Defaults to +\fBtrue\fR\&. See also "\fBnotes\&.rewriteRef\fR" below\&. +.sp +This setting can be overridden with the +\fBGIT_NOTES_REWRITE_REF\fR +environment variable, which must be a colon separated list of refs or globs\&. .RE .PP notes\&.rewriteMode @@ -7050,15 +7096,17 @@ environment variable\&. .PP notes\&.rewriteRef .RS 4 -When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied\&. The ref may be a glob, in which case notes in all matching refs will be copied\&. You may also specify this configuration several times\&. +When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied\&. May be a glob, in which case notes in all matching refs will be copied\&. You may also specify this configuration several times\&. .sp Does not have a default value; you must configure this variable to enable note rewriting\&. Set it to \fBrefs/notes/commits\fR to enable rewriting for the default commit notes\&. .sp -This setting can be overridden with the +Can be overridden with the \fBGIT_NOTES_REWRITE_REF\fR -environment variable, which must be a colon separated list of refs or globs\&. +environment variable\&. See +\fBnotes\&.rewrite\&.\fR +above for a further description of its format\&. .RE .PP pack\&.window @@ -8314,11 +8362,103 @@ parameters found below, taking precedence over those when this identity is selec \fBsendemail\&.identity\fR\&. .RE .PP -sendemail\&.aliasesFile, sendemail\&.aliasFileType, sendemail\&.annotate, sendemail\&.bcc, sendemail\&.cc, sendemail\&.ccCmd, sendemail\&.chainReplyTo, sendemail\&.confirm, sendemail\&.envelopeSender, sendemail\&.from, sendemail\&.multiEdit, sendemail\&.signedoffbycc, sendemail\&.smtpPass, sendemail\&.suppresscc, sendemail\&.suppressFrom, sendemail\&.to, sendemail\&.tocmd, sendemail\&.smtpDomain, sendemail\&.smtpServer, sendemail\&.smtpServerPort, sendemail\&.smtpServerOption, sendemail\&.smtpUser, sendemail\&.thread, sendemail\&.transferEncoding, sendemail\&.validate, sendemail\&.xmailer +sendemail\&.multiEdit .RS 4 -See +If true (default), a single editor instance will be spawned to edit files you have to edit (patches when +\fB\-\-annotate\fR +is used, and the summary when +\fB\-\-compose\fR +is used)\&. If false, files will be edited one after the other, spawning a new editor each time\&. +.RE +.PP +sendemail\&.confirm +.RS 4 +Sets the default for whether to confirm before sending\&. Must be one of +\fIalways\fR, +\fInever\fR, +\fIcc\fR, +\fIcompose\fR, or +\fIauto\fR\&. See +\fB\-\-confirm\fR +in the \fBgit-send-email\fR(1) -for description\&. +documentation for the meaning of these values\&. +.RE +.PP +sendemail\&.aliasesFile +.RS 4 +To avoid typing long email addresses, point this to one or more email aliases files\&. You must also supply +\fBsendemail\&.aliasFileType\fR\&. +.RE +.PP +sendemail\&.aliasFileType +.RS 4 +Format of the file(s) specified in sendemail\&.aliasesFile\&. Must be one of +\fImutt\fR, +\fImailrc\fR, +\fIpine\fR, +\fIelm\fR, or +\fIgnus\fR, or +\fIsendmail\fR\&. +.sp +What an alias file in each format looks like can be found in the documentation of the email program of the same name\&. The differences and limitations from the standard formats are described below: +.PP +sendmail +.RS 4 +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Quoted aliases and quoted addresses are not supported: lines that contain a +\fB"\fR +symbol are ignored\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Redirection to a file (\fB/path/name\fR) or pipe (\fB|command\fR) is not supported\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +File inclusion (\fB:include: /path/name\fR) is not supported\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Warnings are printed on the standard error output for any explicitly unsupported constructs, and any other lines that are not recognized by the parser\&. +.RE +.RE +.RE +.PP +sendemail\&.annotate, sendemail\&.bcc, sendemail\&.cc, sendemail\&.ccCmd, sendemail\&.chainReplyTo, sendemail\&.envelopeSender, sendemail\&.from, sendemail\&.signedoffbycc, sendemail\&.smtpPass, sendemail\&.suppresscc, sendemail\&.suppressFrom, sendemail\&.to, sendemail\&.tocmd, sendemail\&.smtpDomain, sendemail\&.smtpServer, sendemail\&.smtpServerPort, sendemail\&.smtpServerOption, sendemail\&.smtpUser, sendemail\&.thread, sendemail\&.transferEncoding, sendemail\&.validate, sendemail\&.xmailer +.RS 4 +These configuration variables all provide a default for +\fBgit-send-email\fR(1) +command\-line options\&. See its documentation for details\&. .RE .PP sendemail\&.signedoffcc (deprecated) diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index 61df3e45d..19976bb4b 100644 --- a/man1/git-count-objects.1 +++ b/man1/git-count-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-count-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index f44104ecc..d4a80acde 100644 --- a/man1/git-credential-cache--daemon.1 +++ b/man1/git-credential-cache--daemon.1 @@ -2,12 +2,12 @@ .\" Title: git-credential-cache--daemon .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CREDENTIAL\-CAC" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index 382737d88..69691c728 100644 --- a/man1/git-credential-cache.1 +++ b/man1/git-credential-cache.1 @@ -2,12 +2,12 @@ .\" Title: git-credential-cache .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CREDENTIAL\-CAC" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index 4d1fcbb48..200a5f136 100644 --- a/man1/git-credential-store.1 +++ b/man1/git-credential-store.1 @@ -2,12 +2,12 @@ .\" Title: git-credential-store .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STO" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CREDENTIAL\-STO" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential.1 b/man1/git-credential.1 index cdd2c43e6..1a1394719 100644 --- a/man1/git-credential.1 +++ b/man1/git-credential.1 @@ -2,12 +2,12 @@ .\" Title: git-credential .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index 3acc4db32..cbf7be2bf 100644 --- a/man1/git-cvsexportcommit.1 +++ b/man1/git-cvsexportcommit.1 @@ -2,12 +2,12 @@ .\" Title: git-cvsexportcommit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 1bb66bb39..eabf1c607 100644 --- a/man1/git-cvsimport.1 +++ b/man1/git-cvsimport.1 @@ -2,12 +2,12 @@ .\" Title: git-cvsimport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index 250ed2376..77565ec53 100644 --- a/man1/git-cvsserver.1 +++ b/man1/git-cvsserver.1 @@ -2,12 +2,12 @@ .\" Title: git-cvsserver .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 096928f95..ba9d37a6d 100644 --- a/man1/git-daemon.1 +++ b/man1/git-daemon.1 @@ -2,12 +2,12 @@ .\" Title: git-daemon .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DAEMON" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-describe.1 b/man1/git-describe.1 index 8cf759d5f..1003cbf19 100644 --- a/man1/git-describe.1 +++ b/man1/git-describe.1 @@ -2,12 +2,12 @@ .\" Title: git-describe .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diagnose.1 b/man1/git-diagnose.1 index 75feeca06..b7405f3fa 100644 --- a/man1/git-diagnose.1 +++ b/man1/git-diagnose.1 @@ -2,12 +2,12 @@ .\" Title: git-diagnose .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DIAGNOSE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DIAGNOSE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index bc07a0634..ed073974d 100644 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -2,12 +2,12 @@ .\" Title: git-diff-files .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 1fb814c41..566db1ba7 100644 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -2,12 +2,12 @@ .\" Title: git-diff-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 91b32713a..997771992 100644 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-diff-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 8e99a8742..b2ac4e3d3 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-diff .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DIFF" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DIFF" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2129,6 +2129,460 @@ $ git diff \-R \fB(2)\fR \fB2. \fROutput diff in reverse\&. .br .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +diff\&.autoRefreshIndex +.RS 4 +When using +\fIgit diff\fR +to compare with work tree files, do not consider stat\-only change as changed\&. Instead, silently run +\fBgit update\-index \-\-refresh\fR +to update the cached stat information for paths whose contents in the work tree match the contents in the index\&. This option defaults to true\&. Note that this affects only +\fIgit diff\fR +Porcelain, and not lower level +\fIdiff\fR +commands such as +\fIgit diff\-files\fR\&. +.RE +.PP +diff\&.dirstat +.RS 4 +A comma separated list of +\fB\-\-dirstat\fR +parameters specifying the default behavior of the +\fB\-\-dirstat\fR +option to +\fBgit-diff\fR(1) +and friends\&. The defaults can be overridden on the command line (using +\fB\-\-dirstat=\fR)\&. The fallback defaults (when not changed by +\fBdiff\&.dirstat\fR) are +\fBchanges,noncumulative,3\fR\&. The following parameters are available: +.PP +\fBchanges\fR +.RS 4 +Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination\&. This ignores the amount of pure code movements within a file\&. In other words, rearranging lines in a file is not counted as much as other changes\&. This is the default behavior when no parameter is given\&. +.RE +.PP +\fBlines\fR +.RS 4 +Compute the dirstat numbers by doing the regular line\-based diff analysis, and summing the removed/added line counts\&. (For binary files, count 64\-byte chunks instead, since binary files have no natural concept of lines)\&. This is a more expensive +\fB\-\-dirstat\fR +behavior than the +\fBchanges\fR +behavior, but it does count rearranged lines within a file as much as other changes\&. The resulting output is consistent with what you get from the other +\fB\-\-*stat\fR +options\&. +.RE +.PP +\fBfiles\fR +.RS 4 +Compute the dirstat numbers by counting the number of files changed\&. Each changed file counts equally in the dirstat analysis\&. This is the computationally cheapest +\fB\-\-dirstat\fR +behavior, since it does not have to look at the file contents at all\&. +.RE +.PP +\fBcumulative\fR +.RS 4 +Count changes in a child directory for the parent directory as well\&. Note that when using +\fBcumulative\fR, the sum of the percentages reported may exceed 100%\&. The default (non\-cumulative) behavior can be specified with the +\fBnoncumulative\fR +parameter\&. +.RE +.PP + +.RS 4 +An integer parameter specifies a cut\-off percent (3% by default)\&. Directories contributing less than this percentage of the changes are not shown in the output\&. +.RE +.sp +Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: +\fBfiles,10,cumulative\fR\&. +.RE +.PP +diff\&.statGraphWidth +.RS 4 +Limit the width of the graph part in \-\-stat output\&. If set, applies to all commands generating \-\-stat output except format\-patch\&. +.RE +.PP +diff\&.context +.RS 4 +Generate diffs with lines of context instead of the default of 3\&. This value is overridden by the \-U option\&. +.RE +.PP +diff\&.interHunkContext +.RS 4 +Show the context between diff hunks, up to the specified number of lines, thereby fusing the hunks that are close to each other\&. This value serves as the default for the +\fB\-\-inter\-hunk\-context\fR +command line option\&. +.RE +.PP +diff\&.external +.RS 4 +If this config variable is set, diff generation is not performed using the internal diff machinery, but using the given command\&. Can be overridden with the \(oqGIT_EXTERNAL_DIFF\(cq environment variable\&. The command is called with parameters as described under "git Diffs" in +\fBgit\fR(1)\&. Note: if you want to use an external diff program only on a subset of your files, you might want to use +\fBgitattributes\fR(5) +instead\&. +.RE +.PP +diff\&.ignoreSubmodules +.RS 4 +Sets the default value of \-\-ignore\-submodules\&. Note that this affects only +\fIgit diff\fR +Porcelain, and not lower level +\fIdiff\fR +commands such as +\fIgit diff\-files\fR\&. +\fIgit checkout\fR +and +\fIgit switch\fR +also honor this setting when reporting uncommitted changes\&. Setting it to +\fIall\fR +disables the submodule summary normally shown by +\fIgit commit\fR +and +\fIgit status\fR +when +\fBstatus\&.submoduleSummary\fR +is set unless it is overridden by using the \-\-ignore\-submodules command\-line option\&. The +\fIgit submodule\fR +commands are not affected by this setting\&. By default this is set to untracked so that any untracked submodules are ignored\&. +.RE +.PP +diff\&.mnemonicPrefix +.RS 4 +If set, +\fIgit diff\fR +uses a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared\&. When this configuration is in effect, reverse diff output also swaps the order of the prefixes: +.PP +\fBgit diff\fR +.RS 4 +compares the (i)ndex and the (w)ork tree; +.RE +.PP +\fBgit diff HEAD\fR +.RS 4 +compares a (c)ommit and the (w)ork tree; +.RE +.PP +\fBgit diff \-\-cached\fR +.RS 4 +compares a (c)ommit and the (i)ndex; +.RE +.PP +\fBgit diff HEAD:file1 file2\fR +.RS 4 +compares an (o)bject and a (w)ork tree entity; +.RE +.PP +\fBgit diff \-\-no\-index a b\fR +.RS 4 +compares two non\-git things (1) and (2)\&. +.RE +.RE +.PP +diff\&.noprefix +.RS 4 +If set, +\fIgit diff\fR +does not show any source or destination prefix\&. +.RE +.PP +diff\&.relative +.RS 4 +If set to +\fItrue\fR, +\fIgit diff\fR +does not show changes outside of the directory and show pathnames relative to the current directory\&. +.RE +.PP +diff\&.orderFile +.RS 4 +File indicating how to order files within a diff\&. See the +\fI\-O\fR +option to +\fBgit-diff\fR(1) +for details\&. If +\fBdiff\&.orderFile\fR +is a relative pathname, it is treated as relative to the top of the working tree\&. +.RE +.PP +diff\&.renameLimit +.RS 4 +The number of files to consider in the exhaustive portion of copy/rename detection; equivalent to the +\fIgit diff\fR +option +\fB\-l\fR\&. If not set, the default value is currently 1000\&. This setting has no effect if rename detection is turned off\&. +.RE +.PP +diff\&.renames +.RS 4 +Whether and how Git detects renames\&. If set to "false", rename detection is disabled\&. If set to "true", basic rename detection is enabled\&. If set to "copies" or "copy", Git will detect copies, as well\&. Defaults to true\&. Note that this affects only +\fIgit diff\fR +Porcelain like +\fBgit-diff\fR(1) +and +\fBgit-log\fR(1), and not lower level commands such as +\fBgit-diff-files\fR(1)\&. +.RE +.PP +diff\&.suppressBlankEmpty +.RS 4 +A boolean to inhibit the standard behavior of printing a space before each empty output line\&. Defaults to false\&. +.RE +.PP +diff\&.submodule +.RS 4 +Specify the format in which differences in submodules are shown\&. The "short" format just shows the names of the commits at the beginning and end of the range\&. The "log" format lists the commits in the range like +\fBgit-submodule\fR(1) +\fBsummary\fR +does\&. The "diff" format shows an inline diff of the changed contents of the submodule\&. Defaults to "short"\&. +.RE +.PP +diff\&.wordRegex +.RS 4 +A POSIX Extended Regular Expression used to determine what is a "word" when performing word\-by\-word difference calculations\&. Character sequences that match the regular expression are "words", all other characters are +\fBignorable\fR +whitespace\&. +.RE +.PP +diff\&.\&.command +.RS 4 +The custom diff driver command\&. See +\fBgitattributes\fR(5) +for details\&. +.RE +.PP +diff\&.\&.xfuncname +.RS 4 +The regular expression that the diff driver should use to recognize the hunk header\&. A built\-in pattern may also be used\&. See +\fBgitattributes\fR(5) +for details\&. +.RE +.PP +diff\&.\&.binary +.RS 4 +Set this option to true to make the diff driver treat files as binary\&. See +\fBgitattributes\fR(5) +for details\&. +.RE +.PP +diff\&.\&.textconv +.RS 4 +The command that the diff driver should call to generate the text\-converted version of a file\&. The result of the conversion is used to generate a human\-readable diff\&. See +\fBgitattributes\fR(5) +for details\&. +.RE +.PP +diff\&.\&.wordRegex +.RS 4 +The regular expression that the diff driver should use to split words in a line\&. See +\fBgitattributes\fR(5) +for details\&. +.RE +.PP +diff\&.\&.cachetextconv +.RS 4 +Set this option to true to make the diff driver cache the text conversion outputs\&. See +\fBgitattributes\fR(5) +for details\&. +.PP +\fBaraxis\fR +.RS 4 +Use Araxis Merge (requires a graphical session) +.RE +.PP +\fBbc\fR +.RS 4 +Use Beyond Compare (requires a graphical session) +.RE +.PP +\fBbc3\fR +.RS 4 +Use Beyond Compare (requires a graphical session) +.RE +.PP +\fBbc4\fR +.RS 4 +Use Beyond Compare (requires a graphical session) +.RE +.PP +\fBcodecompare\fR +.RS 4 +Use Code Compare (requires a graphical session) +.RE +.PP +\fBdeltawalker\fR +.RS 4 +Use DeltaWalker (requires a graphical session) +.RE +.PP +\fBdiffmerge\fR +.RS 4 +Use DiffMerge (requires a graphical session) +.RE +.PP +\fBdiffuse\fR +.RS 4 +Use Diffuse (requires a graphical session) +.RE +.PP +\fBecmerge\fR +.RS 4 +Use ECMerge (requires a graphical session) +.RE +.PP +\fBemerge\fR +.RS 4 +Use Emacs\(aq Emerge +.RE +.PP +\fBexamdiff\fR +.RS 4 +Use ExamDiff Pro (requires a graphical session) +.RE +.PP +\fBguiffy\fR +.RS 4 +Use Guiffy\(cqs Diff Tool (requires a graphical session) +.RE +.PP +\fBgvimdiff\fR +.RS 4 +Use gVim (requires a graphical session) +.RE +.PP +\fBkdiff3\fR +.RS 4 +Use KDiff3 (requires a graphical session) +.RE +.PP +\fBkompare\fR +.RS 4 +Use Kompare (requires a graphical session) +.RE +.PP +\fBmeld\fR +.RS 4 +Use Meld (requires a graphical session) +.RE +.PP +\fBnvimdiff\fR +.RS 4 +Use Neovim +.RE +.PP +\fBopendiff\fR +.RS 4 +Use FileMerge (requires a graphical session) +.RE +.PP +\fBp4merge\fR +.RS 4 +Use HelixCore P4Merge (requires a graphical session) +.RE +.PP +\fBsmerge\fR +.RS 4 +Use Sublime Merge (requires a graphical session) +.RE +.PP +\fBtkdiff\fR +.RS 4 +Use TkDiff (requires a graphical session) +.RE +.PP +\fBvimdiff\fR +.RS 4 +Use Vim +.RE +.PP +\fBwinmerge\fR +.RS 4 +Use WinMerge (requires a graphical session) +.RE +.PP +\fBxxdiff\fR +.RS 4 +Use xxdiff (requires a graphical session) +.RE +.RE +.PP +diff\&.indentHeuristic +.RS 4 +Set this option to +\fBfalse\fR +to disable the default heuristics that shift diff hunk boundaries to make patches easier to read\&. +.RE +.PP +diff\&.algorithm +.RS 4 +Choose a diff algorithm\&. The variants are as follows: +.PP +\fBdefault\fR, \fBmyers\fR +.RS 4 +The basic greedy diff algorithm\&. Currently, this is the default\&. +.RE +.PP +\fBminimal\fR +.RS 4 +Spend extra time to make sure the smallest possible diff is produced\&. +.RE +.PP +\fBpatience\fR +.RS 4 +Use "patience diff" algorithm when generating patches\&. +.RE +.PP +\fBhistogram\fR +.RS 4 +This algorithm extends the patience algorithm to "support low\-occurrence common elements"\&. +.RE +.RE +.PP +diff\&.wsErrorHighlight +.RS 4 +Highlight whitespace errors in the +\fBcontext\fR, +\fBold\fR +or +\fBnew\fR +lines of the diff\&. Multiple values are separated by comma, +\fBnone\fR +resets previous values, +\fBdefault\fR +reset the list to +\fBnew\fR +and +\fBall\fR +is a shorthand for +\fBold,new,context\fR\&. The whitespace errors are colored with +\fBcolor\&.diff\&.whitespace\fR\&. The command line option +\fB\-\-ws\-error\-highlight=\fR +overrides this setting\&. +.RE +.PP +diff\&.colorMoved +.RS 4 +If set to either a valid +\fB\fR +or a true value, moved lines in a diff are colored differently, for details of valid modes see +\fI\-\-color\-moved\fR +in +\fBgit-diff\fR(1)\&. If simply set to true the default color mode will be used\&. When set to false, moved lines are not colored\&. +.RE +.PP +diff\&.colorMovedWS +.RS 4 +When moved lines are colored using e\&.g\&. the +\fBdiff\&.colorMoved\fR +setting, this option controls the +\fB\fR +how spaces are treated for details of valid modes see +\fI\-\-color\-moved\-ws\fR +in +\fBgit-diff\fR(1)\&. +.RE .SH "SEE ALSO" .sp diff(1), \fBgit-difftool\fR(1), \fBgit-log\fR(1), \fBgitdiffcore\fR(7), \fBgit-format-patch\fR(1), \fBgit-apply\fR(1), \fBgit-show\fR(1) diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index fea81f4a4..afa7d63c2 100644 --- a/man1/git-difftool.1 +++ b/man1/git-difftool.1 @@ -2,12 +2,12 @@ .\" Title: git-difftool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -181,39 +181,45 @@ is used\&. .RE .sp See \fBgit-diff\fR(1) for the full list of supported options\&. -.SH "CONFIG VARIABLES" +.SH "CONFIGURATION" .sp \fIgit difftool\fR falls back to \fIgit mergetool\fR config variables when the difftool equivalents have not been defined\&. +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: .PP diff\&.tool .RS 4 -The default diff tool to use\&. +Controls which diff tool is used by +\fBgit-difftool\fR(1)\&. This variable overrides the value configured in +\fBmerge\&.tool\fR\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom diff tool and requires that a corresponding difftool\&.\&.cmd variable is defined\&. .RE .PP diff\&.guitool .RS 4 -The default diff tool to use when -\fB\-\-gui\fR -is specified\&. -.RE -.PP -difftool\&.\&.path -.RS 4 -Override the path for the given tool\&. This is useful in case your tool is not in the PATH\&. +Controls which diff tool is used by +\fBgit-difftool\fR(1) +when the \-g/\-\-gui flag is specified\&. This variable overrides the value configured in +\fBmerge\&.guitool\fR\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom diff tool and requires that a corresponding difftool\&.\&.cmd variable is defined\&. .RE .PP difftool\&.\&.cmd .RS 4 -Specify the command to invoke the specified diff tool\&. +Specify the command to invoke the specified diff tool\&. The specified command is evaluated in shell with the following variables available: +\fILOCAL\fR +is set to the name of the temporary file containing the contents of the diff pre\-image and +\fIREMOTE\fR +is set to the name of the temporary file containing the contents of the diff post\-image\&. .sp See the \fB\-\-tool=\fR -option above for more details\&. +option in +\fBgit-difftool\fR(1) +for more details\&. .RE .PP -difftool\&.prompt +difftool\&.\&.path .RS 4 -Prompt before each invocation of the diff tool\&. +Override the path for the given tool\&. This is useful in case your tool is not in the PATH\&. .RE .PP difftool\&.trustExitCode @@ -222,7 +228,14 @@ Exit difftool if the invoked diff tool returns a non\-zero exit status\&. .sp See the \fB\-\-trust\-exit\-code\fR -option above for more details\&. +option in +\fBgit-difftool\fR(1) +for more details\&. +.RE +.PP +difftool\&.prompt +.RS 4 +Prompt before each invocation of the diff tool\&. .RE .SH "SEE ALSO" .PP diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index c26ace9de..242fec00d 100644 --- a/man1/git-fast-export.1 +++ b/man1/git-fast-export.1 @@ -2,12 +2,12 @@ .\" Title: git-fast-export .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 1d302d0be..4096c751c 100644 --- a/man1/git-fast-import.1 +++ b/man1/git-fast-import.1 @@ -2,12 +2,12 @@ .\" Title: git-fast-import .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1674,6 +1674,18 @@ The active branch LRU, when coupled with the filename string pool and lazy loadi .SH "SIGNALS" .sp Sending \fBSIGUSR1\fR to the \fIgit fast\-import\fR process ends the current packfile early, simulating a \fBcheckpoint\fR command\&. The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression\&. +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +fastimport\&.unpackLimit +.RS 4 +If the number of objects imported by +\fBgit-fast-import\fR(1) +is below this limit, then the objects will be unpacked into loose object files\&. However if the number of imported objects equals or exceeds this limit then the pack will be stored as a pack\&. Storing the pack from a fast\-import can make the import operation complete faster, especially on slow filesystems\&. If not set, the value of +\fBtransfer\&.unpackLimit\fR +is used instead\&. +.RE .SH "SEE ALSO" .sp \fBgit-fast-export\fR(1) diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index d45f751f7..342b32933 100644 --- a/man1/git-fetch-pack.1 +++ b/man1/git-fetch-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-fetch-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index 1181c3db6..1ad7e3e89 100644 --- a/man1/git-fetch.1 +++ b/man1/git-fetch.1 @@ -2,12 +2,12 @@ .\" Title: git-fetch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FETCH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FETCH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1191,6 +1191,147 @@ The victim sends "have" lines advertising the IDs of objects it has that are not .\} As in #1, the attacker chooses an object ID X to steal\&. The victim sends an object Y that the attacker already has, and the attacker falsely claims to have X and not Y, so the victim sends Y as a delta against X\&. The delta reveals regions of X that are similar to Y to the attacker\&. .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +fetch\&.recurseSubmodules +.RS 4 +This option controls whether +\fBgit fetch\fR +(and the underlying fetch in +\fBgit pull\fR) will recursively fetch into populated submodules\&. This option can be set either to a boolean value or to +\fIon\-demand\fR\&. Setting it to a boolean changes the behavior of fetch and pull to recurse unconditionally into submodules when set to true or to not recurse at all when set to false\&. When set to +\fIon\-demand\fR, fetch and pull will only recurse into a populated submodule when its superproject retrieves a commit that updates the submodule\(cqs reference\&. Defaults to +\fIon\-demand\fR, or to the value of +\fIsubmodule\&.recurse\fR +if set\&. +.RE +.PP +fetch\&.fsckObjects +.RS 4 +If it is set to true, git\-fetch\-pack will check all fetched objects\&. See +\fBtransfer\&.fsckObjects\fR +for what\(cqs checked\&. Defaults to false\&. If not set, the value of +\fBtransfer\&.fsckObjects\fR +is used instead\&. +.RE +.PP +fetch\&.fsck\&. +.RS 4 +Acts like +\fBfsck\&.\fR, but is used by +\fBgit-fetch-pack\fR(1) +instead of +\fBgit-fsck\fR(1)\&. See the +\fBfsck\&.\fR +documentation for details\&. +.RE +.PP +fetch\&.fsck\&.skipList +.RS 4 +Acts like +\fBfsck\&.skipList\fR, but is used by +\fBgit-fetch-pack\fR(1) +instead of +\fBgit-fsck\fR(1)\&. See the +\fBfsck\&.skipList\fR +documentation for details\&. +.RE +.PP +fetch\&.unpackLimit +.RS 4 +If the number of objects fetched over the Git native transfer is below this limit, then the objects will be unpacked into loose object files\&. However if the number of received objects equals or exceeds this limit then the received pack will be stored as a pack, after adding any missing delta bases\&. Storing the pack from a push can make the push operation complete faster, especially on slow filesystems\&. If not set, the value of +\fBtransfer\&.unpackLimit\fR +is used instead\&. +.RE +.PP +fetch\&.prune +.RS 4 +If true, fetch will automatically behave as if the +\fB\-\-prune\fR +option was given on the command line\&. See also +\fBremote\&.\&.prune\fR +and the PRUNING section of +\fBgit-fetch\fR(1)\&. +.RE +.PP +fetch\&.pruneTags +.RS 4 +If true, fetch will automatically behave as if the +\fBrefs/tags/*:refs/tags/*\fR +refspec was provided when pruning, if not set already\&. This allows for setting both this option and +\fBfetch\&.prune\fR +to maintain a 1=1 mapping to upstream refs\&. See also +\fBremote\&.\&.pruneTags\fR +and the PRUNING section of +\fBgit-fetch\fR(1)\&. +.RE +.PP +fetch\&.output +.RS 4 +Control how ref update status is printed\&. Valid values are +\fBfull\fR +and +\fBcompact\fR\&. Default value is +\fBfull\fR\&. See section OUTPUT in +\fBgit-fetch\fR(1) +for detail\&. +.RE +.PP +fetch\&.negotiationAlgorithm +.RS 4 +Control how information about the commits in the local repository is sent when negotiating the contents of the packfile to be sent by the server\&. Set to "consecutive" to use an algorithm that walks over consecutive commits checking each one\&. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger\-than\-necessary packfile; or set to "noop" to not send any information at all, which will almost certainly result in a larger\-than\-necessary packfile, but will skip the negotiation step\&. Set to "default" to override settings made previously and use the default behaviour\&. The default is normally "consecutive", but if +\fBfeature\&.experimental\fR +is true, then the default is "skipping"\&. Unknown values will cause +\fIgit fetch\fR +to error out\&. +.sp +See also the +\fB\-\-negotiate\-only\fR +and +\fB\-\-negotiation\-tip\fR +options to +\fBgit-fetch\fR(1)\&. +.RE +.PP +fetch\&.showForcedUpdates +.RS 4 +Set to false to enable +\fB\-\-no\-show\-forced\-updates\fR +in +\fBgit-fetch\fR(1) +and +\fBgit-pull\fR(1) +commands\&. Defaults to true\&. +.RE +.PP +fetch\&.parallel +.RS 4 +Specifies the maximal number of fetch operations to be run in parallel at a time (submodules, or remotes when the +\fB\-\-multiple\fR +option of +\fBgit-fetch\fR(1) +is in effect)\&. +.sp +A value of 0 will give some reasonable default\&. If unset, it defaults to 1\&. +.sp +For submodules, this setting can be overridden using the +\fBsubmodule\&.fetchJobs\fR +config setting\&. +.RE +.PP +fetch\&.writeCommitGraph +.RS 4 +Set to true to write a commit\-graph after every +\fBgit fetch\fR +command that downloads a pack\-file from a remote\&. Using the +\fB\-\-split\fR +option, most executions will create a very small commit\-graph file on top of the existing commit\-graph file(s)\&. Occasionally, these files will merge and the write may take longer\&. Having an updated commit\-graph file helps performance of many Git commands, including +\fBgit merge\-base\fR, +\fBgit push \-f\fR, and +\fBgit log \-\-graph\fR\&. Defaults to false\&. +.RE .SH "BUGS" .sp Using \-\-recurse\-submodules can only fetch new commits in submodules that are present locally e\&.g\&. in \fB$GIT_DIR/modules/\fR\&. If the upstream adds a new submodule, that submodule cannot be fetched until it is cloned e\&.g\&. by \fBgit submodule update\fR\&. This is expected to be fixed in a future Git version\&. diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index e7aa6981d..dcf75f435 100644 --- a/man1/git-filter-branch.1 +++ b/man1/git-filter-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-filter-branch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index 5b7bfc989..b25233a8b 100644 --- a/man1/git-fmt-merge-msg.1 +++ b/man1/git-fmt-merge-msg.1 @@ -2,12 +2,12 @@ .\" Title: git-fmt-merge-msg .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index 669b8f287..92aa8fb4f 100644 --- a/man1/git-for-each-ref.1 +++ b/man1/git-for-each-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-for-each-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 25d4679e5..b3dcec289 100644 --- a/man1/git-for-each-repo.1 +++ b/man1/git-for-each-repo.1 @@ -2,12 +2,12 @@ .\" Title: git-for-each-repo .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index b7452d2ab..451506cd8 100644 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.1 @@ -2,12 +2,12 @@ .\" Title: git-format-patch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index 2077c56d1..48e013063 100644 --- a/man1/git-fsck-objects.1 +++ b/man1/git-fsck-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-fsck-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index 4bc1597bb..fa461f8da 100644 --- a/man1/git-fsck.1 +++ b/man1/git-fsck.1 @@ -2,12 +2,12 @@ .\" Title: git-fsck .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FSCK" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FSCK" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -131,6 +131,8 @@ they are reachable, compatible with Progress status is reported on the standard error stream by default when it is attached to a terminal, unless \-\-no\-progress or \-\-verbose is specified\&. \-\-progress forces progress status even if the standard error stream is not directed to a terminal\&. .RE .SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP fsck\&. .RS 4 diff --git a/man1/git-fsmonitor--daemon.1 b/man1/git-fsmonitor--daemon.1 index 670227b66..a104be200 100644 --- a/man1/git-fsmonitor--daemon.1 +++ b/man1/git-fsmonitor--daemon.1 @@ -2,12 +2,12 @@ .\" Title: git-fsmonitor--daemon .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-FSMONITOR\-\-DA" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-FSMONITOR\-\-DA" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 2ef33767a..8297f7da0 100644 --- a/man1/git-gc.1 +++ b/man1/git-gc.1 @@ -2,12 +2,12 @@ .\" Title: git-gc .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-GC" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-GC" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -118,7 +118,7 @@ Furthermore, supplying \fB\-\-aggressive\fR will tweak the \fB\-\-depth\fR and \ It\(cqs probably not worth it to use this option on a given repository without running tailored performance benchmarks on it\&. It takes a lot more time, and the resulting space/delta optimization may or may not be worth it\&. Not using this at all is the right trade\-off for most users and their repositories\&. .SH "CONFIGURATION" .sp -The below documentation is the same as what\(cqs found in \fBgit-config\fR(1): +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP gc\&.aggressiveDepth .RS 4 diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1 index 0bd6572b4..334af4d62 100644 --- a/man1/git-get-tar-commit-id.1 +++ b/man1/git-get-tar-commit-id.1 @@ -2,12 +2,12 @@ .\" Title: git-get-tar-commit-id .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMI" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMI" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 5a1b93d29..e8aa35d99 100644 --- a/man1/git-grep.1 +++ b/man1/git-grep.1 @@ -2,12 +2,12 @@ .\" Title: git-grep .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-GREP" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-GREP" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -417,6 +417,8 @@ The \fB\-\-threads\fR option (and the grep\&.threads configuration) will be igno .sp When grepping the object store (with \fB\-\-cached\fR or giving tree objects), running with multiple threads might perform slower than single threaded if \fB\-\-textconv\fR is given and there\(cqre too many text conversions\&. So if you experience low performance in this case, it might be desirable to use \fB\-\-threads=1\fR\&. .SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP grep\&.lineNumber .RS 4 @@ -446,7 +448,12 @@ will enable the \fB\-\-perl\-regexp\fR option accordingly, while the value \fIdefault\fR -will return to the default matching behavior\&. +will use the +\fBgrep\&.extendedRegexp\fR +option to choose between +\fIbasic\fR +and +\fIextended\fR\&. .RE .PP grep\&.extendedRegexp diff --git a/man1/git-gui.1 b/man1/git-gui.1 index d859a6e61..c292b728f 100644 --- a/man1/git-gui.1 +++ b/man1/git-gui.1 @@ -2,12 +2,12 @@ .\" Title: git-gui .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-GUI" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-GUI" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index 52c21c3fe..1f0b4176f 100644 --- a/man1/git-hash-object.1 +++ b/man1/git-hash-object.1 @@ -2,12 +2,12 @@ .\" Title: git-hash-object .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-help.1 b/man1/git-help.1 index ceba7e020..a36835ed1 100644 --- a/man1/git-help.1 +++ b/man1/git-help.1 @@ -2,12 +2,12 @@ .\" Title: git-help .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-HELP" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-HELP" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hook.1 b/man1/git-hook.1 index 88569267b..37fc2b51e 100644 --- a/man1/git-hook.1 +++ b/man1/git-hook.1 @@ -2,12 +2,12 @@ .\" Title: git-hook .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-HOOK" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-HOOK" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index 5ede7ec08..6418d5669 100644 --- a/man1/git-http-backend.1 +++ b/man1/git-http-backend.1 @@ -2,12 +2,12 @@ .\" Title: git-http-backend .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index e46fa3701..147e20745 100644 --- a/man1/git-http-fetch.1 +++ b/man1/git-http-fetch.1 @@ -2,12 +2,12 @@ .\" Title: git-http-fetch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index ee2f9dbc1..18d2c94ab 100644 --- a/man1/git-http-push.1 +++ b/man1/git-http-push.1 @@ -2,12 +2,12 @@ .\" Title: git-http-push .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index 46f9f8bee..cab2a9322 100644 --- a/man1/git-imap-send.1 +++ b/man1/git-imap-send.1 @@ -2,12 +2,12 @@ .\" Title: git-imap-send .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -66,6 +66,8 @@ Talk to the IMAP server using git\(cqs own IMAP routines instead of using libcur .SH "CONFIGURATION" .sp To use the tool, \fBimap\&.folder\fR and either \fBimap\&.tunnel\fR or \fBimap\&.host\fR must be set to appropriate values\&. +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: .PP imap\&.folder .RS 4 diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index f43a81958..576bbec19 100644 --- a/man1/git-index-pack.1 +++ b/man1/git-index-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-index-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index fcad712ca..c6fd8dc58 100644 --- a/man1/git-init-db.1 +++ b/man1/git-init-db.1 @@ -2,12 +2,12 @@ .\" Title: git-init-db .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index a8f4219d0..0a947e826 100644 --- a/man1/git-init.1 +++ b/man1/git-init.1 @@ -2,12 +2,12 @@ .\" Title: git-init .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-INIT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-INIT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -243,6 +243,20 @@ $ git commit \fB(3)\fR \fB3. \fRRecord the pristine state as the first commit in the history\&. .br .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +init\&.templateDir +.RS 4 +Specify the directory from which templates will be copied\&. (See the "TEMPLATE DIRECTORY" section of +\fBgit-init\fR(1)\&.) +.RE +.PP +init\&.defaultBranch +.RS 4 +Allows overriding the default branch name e\&.g\&. when initializing a new repository\&. +.RE .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index 9693abd94..6c3ffdcca 100644 --- a/man1/git-instaweb.1 +++ b/man1/git-instaweb.1 @@ -2,12 +2,12 @@ .\" Title: git-instaweb .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index 862553d4b..2a5439ff0 100644 --- a/man1/git-interpret-trailers.1 +++ b/man1/git-interpret-trailers.1 @@ -2,12 +2,12 @@ .\" Title: git-interpret-trailers .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAI" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-INTERPRET\-TRAI" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-log.1 b/man1/git-log.1 index c9196f050..0f2143438 100644 --- a/man1/git-log.1 +++ b/man1/git-log.1 @@ -2,12 +2,12 @@ .\" Title: git-log .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-LOG" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-LOG" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -4449,17 +4449,83 @@ above\&.) Defaults to the value of \fBi18n\&.commitEncoding\fR if set, and UTF\-8 otherwise\&. .RE +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: +.PP +log\&.abbrevCommit +.RS 4 +If true, makes +\fBgit-log\fR(1), +\fBgit-show\fR(1), and +\fBgit-whatchanged\fR(1) +assume +\fB\-\-abbrev\-commit\fR\&. You may override this option with +\fB\-\-no\-abbrev\-commit\fR\&. +.RE .PP log\&.date .RS 4 -Default format for human\-readable dates\&. (Compare the +Set the default date\-time mode for the +\fIlog\fR +command\&. Setting a value for log\&.date is similar to using +\fIgit log\fR\(aqs \fB\-\-date\fR -option\&.) Defaults to "default", which means to write dates like -\fBSat May 8 19:35:34 2010 \-0500\fR\&. +option\&. See +\fBgit-log\fR(1) +for details\&. .sp If the format is set to "auto:foo" and the pager is in use, format "foo" will be the used for the date format\&. Otherwise "default" will be used\&. .RE .PP +log\&.decorate +.RS 4 +Print out the ref names of any commits that are shown by the log command\&. If +\fIshort\fR +is specified, the ref name prefixes +\fIrefs/heads/\fR, +\fIrefs/tags/\fR +and +\fIrefs/remotes/\fR +will not be printed\&. If +\fIfull\fR +is specified, the full ref name (including prefix) will be printed\&. If +\fIauto\fR +is specified, then if the output is going to a terminal, the ref names are shown as if +\fIshort\fR +were given, otherwise no ref names are shown\&. This is the same as the +\fB\-\-decorate\fR +option of the +\fBgit log\fR\&. +.RE +.PP +log\&.initialDecorationSet +.RS 4 +By default, +\fBgit log\fR +only shows decorations for certain known ref namespaces\&. If +\fIall\fR +is specified, then show all refs as decorations\&. +.RE +.PP +log\&.excludeDecoration +.RS 4 +Exclude the specified patterns from the log decorations\&. This is similar to the +\fB\-\-decorate\-refs\-exclude\fR +command\-line option, but the config option can be overridden by the +\fB\-\-decorate\-refs\fR +option\&. +.RE +.PP +log\&.diffMerges +.RS 4 +Set default diff format to be used for merge commits\&. See +\fB\-\-diff\-merges\fR +in +\fBgit-log\fR(1) +for details\&. Defaults to +\fBseparate\fR\&. +.RE +.PP log\&.follow .RS 4 If @@ -4471,52 +4537,133 @@ option was used when a single is given\&. This has the same limitations a \fB\-\-follow\fR, i\&.e\&. it cannot be used to follow multiple files and does not work well on non\-linear history\&. .RE .PP +log\&.graphColors +.RS 4 +A list of colors, separated by commas, that can be used to draw history lines in +\fBgit log \-\-graph\fR\&. +.RE +.PP log\&.showRoot .RS 4 -If -\fBfalse\fR, -\fBgit log\fR -and related commands will not treat the initial commit as a big creation event\&. Any root commits in -\fBgit log \-p\fR -output would be shown without a diff attached\&. The default is -\fBtrue\fR\&. +If true, the initial commit will be shown as a big creation event\&. This is equivalent to a diff against an empty tree\&. Tools like +\fBgit-log\fR(1) +or +\fBgit-whatchanged\fR(1), which normally hide the root commit will now show it\&. True by default\&. .RE .PP log\&.showSignature .RS 4 -If -\fBtrue\fR, -\fBgit log\fR -and related commands will act as if the -\fB\-\-show\-signature\fR -option was passed to them\&. +If true, makes +\fBgit-log\fR(1), +\fBgit-show\fR(1), and +\fBgit-whatchanged\fR(1) +assume +\fB\-\-show\-signature\fR\&. .RE .PP -mailmap\&.* +log\&.mailmap .RS 4 -See -\fBgit-shortlog\fR(1)\&. +If true, makes +\fBgit-log\fR(1), +\fBgit-show\fR(1), and +\fBgit-whatchanged\fR(1) +assume +\fB\-\-use\-mailmap\fR, otherwise assume +\fB\-\-no\-use\-mailmap\fR\&. True by default\&. +.RE +.PP +notes\&.mergeStrategy +.RS 4 +Which merge strategy to choose by default when resolving notes conflicts\&. Must be one of +\fBmanual\fR, +\fBours\fR, +\fBtheirs\fR, +\fBunion\fR, or +\fBcat_sort_uniq\fR\&. Defaults to +\fBmanual\fR\&. See "NOTES MERGE STRATEGIES" section of +\fBgit-notes\fR(1) +for more information on each strategy\&. +.sp +This setting can be overridden by passing the +\fB\-\-strategy\fR +option to +\fBgit-notes\fR(1)\&. +.RE +.PP +notes\&.\&.mergeStrategy +.RS 4 +Which merge strategy to choose when doing a notes merge into refs/notes/\&. This overrides the more general "notes\&.mergeStrategy"\&. See the "NOTES MERGE STRATEGIES" section in +\fBgit-notes\fR(1) +for more information on the available strategies\&. .RE .PP notes\&.displayRef .RS 4 -Which refs, in addition to the default set by +Which ref (or refs, if a glob or specified more than once), in addition to the default set by \fBcore\&.notesRef\fR or \fBGIT_NOTES_REF\fR, to read notes from when showing commit messages with the -\fBlog\fR -family of commands\&. See -\fBgit-notes\fR(1)\&. +\fIgit log\fR +family of commands\&. .sp -May be an unabbreviated ref name or a glob and may be specified multiple times\&. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&. +This setting can be overridden with the +\fBGIT_NOTES_DISPLAY_REF\fR +environment variable, which must be a colon separated list of refs or globs\&. +.sp +A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&. .sp This setting can be disabled by the \fB\-\-no\-notes\fR -option, overridden by the -\fBGIT_NOTES_DISPLAY_REF\fR -environment variable, and overridden by the +option to the +\fIgit log\fR +family of commands, or by the \fB\-\-notes=\fR -option\&. +option accepted by those commands\&. +.sp +The effective value of "core\&.notesRef" (possibly overridden by GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed\&. +.RE +.PP +notes\&.rewrite\&. +.RS 4 +When rewriting commits with (currently +\fBamend\fR +or +\fBrebase\fR), if this variable is +\fBfalse\fR, git will not copy notes from the original to the rewritten commit\&. Defaults to +\fBtrue\fR\&. See also "\fBnotes\&.rewriteRef\fR" below\&. +.sp +This setting can be overridden with the +\fBGIT_NOTES_REWRITE_REF\fR +environment variable, which must be a colon separated list of refs or globs\&. +.RE +.PP +notes\&.rewriteMode +.RS 4 +When copying notes during a rewrite (see the "notes\&.rewrite\&." option), determines what to do if the target commit already has a note\&. Must be one of +\fBoverwrite\fR, +\fBconcatenate\fR, +\fBcat_sort_uniq\fR, or +\fBignore\fR\&. Defaults to +\fBconcatenate\fR\&. +.sp +This setting can be overridden with the +\fBGIT_NOTES_REWRITE_MODE\fR +environment variable\&. +.RE +.PP +notes\&.rewriteRef +.RS 4 +When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied\&. May be a glob, in which case notes in all matching refs will be copied\&. You may also specify this configuration several times\&. +.sp +Does not have a default value; you must configure this variable to enable note rewriting\&. Set it to +\fBrefs/notes/commits\fR +to enable rewriting for the default commit notes\&. +.sp +Can be overridden with the +\fBGIT_NOTES_REWRITE_REF\fR +environment variable\&. See +\fBnotes\&.rewrite\&.\fR +above for a further description of its format\&. .RE .SH "GIT" .sp diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index 7348fa844..23ca5c82e 100644 --- a/man1/git-ls-files.1 +++ b/man1/git-ls-files.1 @@ -2,12 +2,12 @@ .\" Title: git-ls-files .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index 386813e8e..47022de8a 100644 --- a/man1/git-ls-remote.1 +++ b/man1/git-ls-remote.1 @@ -2,12 +2,12 @@ .\" Title: git-ls-remote .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 4242fc1bd..d310d5ce2 100644 --- a/man1/git-ls-tree.1 +++ b/man1/git-ls-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-ls-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index b4d467710..7cf7d4d72 100644 --- a/man1/git-mailinfo.1 +++ b/man1/git-mailinfo.1 @@ -2,12 +2,12 @@ .\" Title: git-mailinfo .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MAILINFO" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -196,6 +196,17 @@ The commit log message extracted from e\-mail, usually except the title line whi .RS 4 The patch extracted from e\-mail\&. .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +mailinfo\&.scissors +.RS 4 +If true, makes +\fBgit-mailinfo\fR(1) +(and therefore +\fBgit-am\fR(1)) act by default as if the \-\-scissors option was provided on the command\-line\&. When active, this features removes everything from the message body before a scissors line (i\&.e\&. consisting mainly of ">8", "8<" and "\-")\&. +.RE .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index ea3e094e1..5be5903a6 100644 --- a/man1/git-mailsplit.1 +++ b/man1/git-mailsplit.1 @@ -2,12 +2,12 @@ .\" Title: git-mailsplit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index da5dd2793..671cc0287 100644 --- a/man1/git-maintenance.1 +++ b/man1/git-maintenance.1 @@ -2,12 +2,12 @@ .\" Title: git-maintenance .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -435,6 +435,124 @@ Windows does not support \fBcron\fR and instead has its own system for schedulin Note that since Git is a console application, these background tasks create a console window visible to the current user\&. This can be changed manually by selecting the "Run whether user is logged in or not" option in Task Scheduler\&. This change requires a password input, which is why \fBgit maintenance start\fR does not select it by default\&. .sp If you want to customize the background tasks, please rename the tasks so future calls to \fBgit maintenance (start|stop)\fR do not overwrite your custom tasks\&. +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +maintenance\&.auto +.RS 4 +This boolean config option controls whether some commands run +\fBgit maintenance run \-\-auto\fR +after doing their normal work\&. Defaults to true\&. +.RE +.PP +maintenance\&.strategy +.RS 4 +This string config option provides a way to specify one of a few recommended schedules for background maintenance\&. This only affects which tasks are run during +\fBgit maintenance run \-\-schedule=X\fR +commands, provided no +\fB\-\-task=\fR +arguments are provided\&. Further, if a +\fBmaintenance\&.\&.schedule\fR +config value is set, then that value is used instead of the one provided by +\fBmaintenance\&.strategy\fR\&. The possible strategy strings are: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBnone\fR: This default setting implies no task are run at any schedule\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBincremental\fR: This setting optimizes for performing small maintenance activities that do not delete any data\&. This does not schedule the +\fBgc\fR +task, but runs the +\fBprefetch\fR +and +\fBcommit\-graph\fR +tasks hourly, the +\fBloose\-objects\fR +and +\fBincremental\-repack\fR +tasks daily, and the +\fBpack\-refs\fR +task weekly\&. +.RE +.RE +.PP +maintenance\&.\&.enabled +.RS 4 +This boolean config option controls whether the maintenance task with name +\fB\fR +is run when no +\fB\-\-task\fR +option is specified to +\fBgit maintenance run\fR\&. These config values are ignored if a +\fB\-\-task\fR +option exists\&. By default, only +\fBmaintenance\&.gc\&.enabled\fR +is true\&. +.RE +.PP +maintenance\&.\&.schedule +.RS 4 +This config option controls whether or not the given +\fB\fR +runs during a +\fBgit maintenance run \-\-schedule=\fR +command\&. The value must be one of "hourly", "daily", or "weekly"\&. +.RE +.PP +maintenance\&.commit\-graph\&.auto +.RS 4 +This integer config option controls how often the +\fBcommit\-graph\fR +task should be run as part of +\fBgit maintenance run \-\-auto\fR\&. If zero, then the +\fBcommit\-graph\fR +task will not run with the +\fB\-\-auto\fR +option\&. A negative value will force the task to run every time\&. Otherwise, a positive value implies the command should run when the number of reachable commits that are not in the commit\-graph file is at least the value of +\fBmaintenance\&.commit\-graph\&.auto\fR\&. The default value is 100\&. +.RE +.PP +maintenance\&.loose\-objects\&.auto +.RS 4 +This integer config option controls how often the +\fBloose\-objects\fR +task should be run as part of +\fBgit maintenance run \-\-auto\fR\&. If zero, then the +\fBloose\-objects\fR +task will not run with the +\fB\-\-auto\fR +option\&. A negative value will force the task to run every time\&. Otherwise, a positive value implies the command should run when the number of loose objects is at least the value of +\fBmaintenance\&.loose\-objects\&.auto\fR\&. The default value is 100\&. +.RE +.PP +maintenance\&.incremental\-repack\&.auto +.RS 4 +This integer config option controls how often the +\fBincremental\-repack\fR +task should be run as part of +\fBgit maintenance run \-\-auto\fR\&. If zero, then the +\fBincremental\-repack\fR +task will not run with the +\fB\-\-auto\fR +option\&. A negative value will force the task to run every time\&. Otherwise, a positive value implies the command should run when the number of pack\-files not in the multi\-pack\-index is at least the value of +\fBmaintenance\&.incremental\-repack\&.auto\fR\&. The default value is 10\&. +.RE .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index e1806cf2a..69e8ead9b 100644 --- a/man1/git-merge-base.1 +++ b/man1/git-merge-base.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-base .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index 0ca31e228..5f3f3454a 100644 --- a/man1/git-merge-file.1 +++ b/man1/git-merge-file.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index 6cdc05ac5..a3da2b4d3 100644 --- a/man1/git-merge-index.1 +++ b/man1/git-merge-index.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGE\-INDEX" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1 index 9b376ad2e..2daff2c1b 100644 --- a/man1/git-merge-one-file.1 +++ b/man1/git-merge-one-file.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-one-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGE\-ONE\-FIL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGE\-ONE\-FIL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index a9f616441..503bd5ec3 100644 --- a/man1/git-merge-tree.1 +++ b/man1/git-merge-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 7ce8cd7c7..e285d4da7 100644 --- a/man1/git-merge.1 +++ b/man1/git-merge.1 @@ -2,12 +2,12 @@ .\" Title: git-merge .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -928,6 +928,14 @@ strategy\&. When merging trees A and B, if B corresponds to a subtree of A, B is With the strategies that use 3\-way merge (including the default, \fIort\fR), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing\&. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits\&. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead\&. .SH "CONFIGURATION" .PP +branch\&.\&.mergeOptions +.RS 4 +Sets default options for merging into branch \&. The syntax and supported options are the same as those of +\fIgit merge\fR, but option values containing whitespace characters are currently not supported\&. +.RE +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: +.PP merge\&.conflictStyle .RS 4 Specify the style in which conflicted hunks are written out to working tree files upon merge\&. The default is "merge", which shows a @@ -1248,12 +1256,6 @@ Names a low\-level merge driver to be used when performing an internal merge bet \fBgitattributes\fR(5) for details\&. .RE -.PP -branch\&.\&.mergeOptions -.RS 4 -Sets default options for merging into branch \&. The syntax and supported options are the same as those of -\fIgit merge\fR, but option values containing whitespace characters are currently not supported\&. -.RE .SH "SEE ALSO" .sp \fBgit-fmt-merge-msg\fR(1), \fBgit-pull\fR(1), \fBgitattributes\fR(5), \fBgit-reset\fR(1), \fBgit-diff\fR(1), \fBgit-ls-files\fR(1), \fBgit-add\fR(1), \fBgit-rm\fR(1), \fBgit-mergetool\fR(1) diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index 0bef3c47b..affa3c0a1 100644 --- a/man1/git-mergetool--lib.1 +++ b/man1/git-mergetool--lib.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool--lib .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LI" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LI" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 6d06abae1..8b6d0678c 100644 --- a/man1/git-mergetool.1 +++ b/man1/git-mergetool.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -152,6 +152,8 @@ configuration variable (see \fB\-O/dev/null\fR\&. .RE .SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: .PP mergetool\&.\&.path .RS 4 diff --git a/man1/git-mktag.1 b/man1/git-mktag.1 index bc65251ad..5e0342532 100644 --- a/man1/git-mktag.1 +++ b/man1/git-mktag.1 @@ -2,12 +2,12 @@ .\" Title: git-mktag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MKTAG" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MKTAG" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 index b48fe6930..17f54b6ba 100644 --- a/man1/git-mktree.1 +++ b/man1/git-mktree.1 @@ -2,12 +2,12 @@ .\" Title: git-mktree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MKTREE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MKTREE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-multi-pack-index.1 b/man1/git-multi-pack-index.1 index f027489a0..e3bec1614 100644 --- a/man1/git-multi-pack-index.1 +++ b/man1/git-multi-pack-index.1 @@ -2,12 +2,12 @@ .\" Title: git-multi-pack-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MULTI\-PACK\-IN" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MULTI\-PACK\-IN" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mv.1 b/man1/git-mv.1 index 91d96e6aa..a44e77325 100644 --- a/man1/git-mv.1 +++ b/man1/git-mv.1 @@ -2,12 +2,12 @@ .\" Title: git-mv .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-MV" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-MV" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index 02a061d79..41860de19 100644 --- a/man1/git-name-rev.1 +++ b/man1/git-name-rev.1 @@ -2,12 +2,12 @@ .\" Title: git-name-rev .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-NAME\-REV" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-NAME\-REV" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-notes.1 b/man1/git-notes.1 index c52685d29..d0389f195 100644 --- a/man1/git-notes.1 +++ b/man1/git-notes.1 @@ -2,12 +2,12 @@ .\" Title: git-notes .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-NOTES" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-NOTES" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -56,7 +56,7 @@ A typical use of notes is to supplement a commit message without changing the co .sp Notes can also be added to patches prepared with \fBgit format\-patch\fR by using the \fB\-\-notes\fR option\&. Such notes are added as a patch commentary after a three dash separator line\&. .sp -To change which notes are shown by \fIgit log\fR, see the "notes\&.displayRef" configuration in \fBgit-log\fR(1)\&. +To change which notes are shown by \fIgit log\fR, see the "notes\&.displayRef" discussion in the section called \(lqCONFIGURATION\(rq\&. .sp See the "notes\&.rewrite\&." configuration for a way to carry notes across commands that rewrite commits\&. .SH "SUBCOMMANDS" @@ -310,6 +310,8 @@ core\&.notesRef Notes ref to read and manipulate instead of \fBrefs/notes/commits\fR\&. Must be an unabbreviated ref name\&. This setting can be overridden through the environment and command line\&. .RE +.sp +Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there: .PP notes\&.mergeStrategy .RS 4 @@ -319,16 +321,21 @@ Which merge strategy to choose by default when resolving notes conflicts\&. Must \fBtheirs\fR, \fBunion\fR, or \fBcat_sort_uniq\fR\&. Defaults to -\fBmanual\fR\&. See "NOTES MERGE STRATEGIES" section above for more information on each strategy\&. +\fBmanual\fR\&. See "NOTES MERGE STRATEGIES" section of +\fBgit-notes\fR(1) +for more information on each strategy\&. .sp This setting can be overridden by passing the \fB\-\-strategy\fR -option\&. +option to +\fBgit-notes\fR(1)\&. .RE .PP notes\&.\&.mergeStrategy .RS 4 -Which merge strategy to choose when doing a notes merge into refs/notes/\&. This overrides the more general "notes\&.mergeStrategy"\&. See the "NOTES MERGE STRATEGIES" section above for more information on each available strategy\&. +Which merge strategy to choose when doing a notes merge into refs/notes/\&. This overrides the more general "notes\&.mergeStrategy"\&. See the "NOTES MERGE STRATEGIES" section in +\fBgit-notes\fR(1) +for more information on the available strategies\&. .RE .PP notes\&.displayRef @@ -338,10 +345,23 @@ Which ref (or refs, if a glob or specified more than once), in addition to the d or \fBGIT_NOTES_REF\fR, to read notes from when showing commit messages with the \fIgit log\fR -family of commands\&. This setting can be overridden on the command line or by the +family of commands\&. +.sp +This setting can be overridden with the \fBGIT_NOTES_DISPLAY_REF\fR -environment variable\&. See -\fBgit-log\fR(1)\&. +environment variable, which must be a colon separated list of refs or globs\&. +.sp +A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored\&. +.sp +This setting can be disabled by the +\fB\-\-no\-notes\fR +option to the +\fIgit log\fR +family of commands, or by the +\fB\-\-notes=\fR +option accepted by those commands\&. +.sp +The effective value of "core\&.notesRef" (possibly overridden by GIT_NOTES_REF) is also implicitly added to the list of refs to be displayed\&. .RE .PP notes\&.rewrite\&. @@ -353,14 +373,14 @@ or \fBfalse\fR, git will not copy notes from the original to the rewritten commit\&. Defaults to \fBtrue\fR\&. See also "\fBnotes\&.rewriteRef\fR" below\&. .sp -This setting can be overridden by the +This setting can be overridden with the \fBGIT_NOTES_REWRITE_REF\fR -environment variable\&. +environment variable, which must be a colon separated list of refs or globs\&. .RE .PP notes\&.rewriteMode .RS 4 -When copying notes during a rewrite, what to do if the target commit already has a note\&. Must be one of +When copying notes during a rewrite (see the "notes\&.rewrite\&." option), determines what to do if the target commit already has a note\&. Must be one of \fBoverwrite\fR, \fBconcatenate\fR, \fBcat_sort_uniq\fR, or @@ -376,11 +396,15 @@ notes\&.rewriteRef .RS 4 When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied\&. May be a glob, in which case notes in all matching refs will be copied\&. You may also specify this configuration several times\&. .sp -Does not have a default value; you must configure this variable to enable note rewriting\&. +Does not have a default value; you must configure this variable to enable note rewriting\&. Set it to +\fBrefs/notes/commits\fR +to enable rewriting for the default commit notes\&. .sp Can be overridden with the \fBGIT_NOTES_REWRITE_REF\fR -environment variable\&. +environment variable\&. See +\fBnotes\&.rewrite\&.\fR +above for a further description of its format\&. .RE .SH "ENVIRONMENT" .PP diff --git a/man1/git-p4.1 b/man1/git-p4.1 index d021f54e4..a1496ed0e 100644 --- a/man1/git-p4.1 +++ b/man1/git-p4.1 @@ -2,12 +2,12 @@ .\" Title: git-p4 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-P4" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-P4" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index 31401cc31..cb81d74a3 100644 --- a/man1/git-pack-objects.1 +++ b/man1/git-pack-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-pack-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PACK\-OBJECTS" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index 808c4588f..b4c599429 100644 --- a/man1/git-pack-redundant.1 +++ b/man1/git-pack-redundant.1 @@ -2,12 +2,12 @@ .\" Title: git-pack-redundant .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PACK\-REDUNDANT" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PACK\-REDUNDANT" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1 index 7774923f4..33fe0fed2 100644 --- a/man1/git-pack-refs.1 +++ b/man1/git-pack-refs.1 @@ -2,12 +2,12 @@ .\" Title: git-pack-refs .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PACK\-REFS" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PACK\-REFS" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1 index 892a78a9a..6a8c2d2c4 100644 --- a/man1/git-patch-id.1 +++ b/man1/git-patch-id.1 @@ -2,12 +2,12 @@ .\" Title: git-patch-id .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PATCH\-ID" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PATCH\-ID" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1 index a6433bf3a..734c774f4 100644 --- a/man1/git-prune-packed.1 +++ b/man1/git-prune-packed.1 @@ -2,12 +2,12 @@ .\" Title: git-prune-packed .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PRUNE\-PACKED" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PRUNE\-PACKED" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune.1 b/man1/git-prune.1 index 976e2dd7d..427d411bd 100644 --- a/man1/git-prune.1 +++ b/man1/git-prune.1 @@ -2,12 +2,12 @@ .\" Title: git-prune .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PRUNE" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PRUNE" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pull.1 b/man1/git-pull.1 index 8f5cc8629..340e1c2e1 100644 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -2,12 +2,12 @@ .\" Title: git-pull .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PULL" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PULL" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-push.1 b/man1/git-push.1 index 494e611de..8dc0557a6 100644 --- a/man1/git-push.1 +++ b/man1/git-push.1 @@ -2,12 +2,12 @@ .\" Title: git-push .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 09/13/2022 +.\" Date: 09/14/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.611.ge188ec3a73 +.\" Source: Git 2.37.3.662.g36f8e7ed7d .\" Language: English .\" -.TH "GIT\-PUSH" "1" "09/13/2022" "Git 2\&.37\&.3\&.611\&.ge188ec" "Git Manual" +.TH "GIT\-PUSH" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1234,6 +1234,229 @@ The victim sends "have" lines advertising the IDs of objects it has that are not .\} As in #1, the attacker chooses an object ID X to steal\&. The victim sends an object Y that the attacker already has, and the attacker falsely claims to have X and not Y, so the victim sends Y as a delta against X\&. The delta reveals regions of X that are similar to Y to the attacker\&. .RE +.SH "CONFIGURATION" +.sp +Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there: +.PP +push\&.autoSetupRemote +.RS 4 +If set to "true" assume +\fB\-\-set\-upstream\fR +on default push when no upstream tracking exists for the current branch; this option takes effect with push\&.default options +\fIsimple\fR, +\fIupstream\fR, and +\fIcurrent\fR\&. It is useful if by default you want new branches to be pushed to the default remote (like the behavior of +\fIpush\&.default=current\fR) and you also want the upstream tracking to be set\&. Workflows most likely to benefit from this option are +\fIsimple\fR +central workflows where all branches are expected to have the same name on the remote\&. +.RE +.PP +push\&.default +.RS 4 +Defines the action +\fBgit push\fR +should take if no refspec is given (whether from the command\-line, config, or elsewhere)\&. Different values are well\-suited for specific workflows; for instance, in a purely central workflow (i\&.e\&. the fetch source is equal to the push destination), +\fBupstream\fR +is probably what you want\&. Possible values are: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBnothing\fR +\- do not push anything (error out) unless a refspec is given\&. This is primarily meant for people who want to avoid mistakes by always being explicit\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBcurrent\fR +\- push the current branch to update a branch with the same name on the receiving end\&. Works in both central and non\-central workflows\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBupstream\fR +\- push the current branch back to the branch whose changes are usually integrated into the current branch (which is called +\fB@{upstream}\fR)\&. This mode only makes sense if you are pushing to the same repository you would normally pull from (i\&.e\&. central workflow)\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBtracking\fR +\- This is a deprecated synonym for +\fBupstream\fR\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBsimple\fR +\- pushes the current branch with the same name on the remote\&. +.sp +If you are working on a centralized workflow (pushing to the same repository you pull from, which is typically +\fBorigin\fR), then you need to configure an upstream branch with the same name\&. +.sp +This mode is the default since Git 2\&.0, and is the safest option suited for beginners\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBmatching\fR +\- push all branches having the same name on both ends\&. This makes the repository you are pushing to remember the set of branches that will be pushed out (e\&.g\&. if you always push +\fImaint\fR +and +\fImaster\fR +there and no other branches, the repository you push to will have these two branches, and your local +\fImaint\fR +and +\fImaster\fR +will be pushed there)\&. +.sp +To use this mode effectively, you have to make sure +\fIall\fR +the branches you would push out are ready to be pushed out before running +\fIgit push\fR, as the whole point of this mode is to allow you to push all of the branches in one go\&. If you usually finish work on only one branch and push out the result, while other branches are unfinished, this mode is not for you\&. Also this mode is not suitable for pushing into a shared central repository, as other people may add new branches there, or update the tip of existing branches outside your control\&. +.sp +This used to be the default, but not since Git 2\&.0 (\fBsimple\fR +is the new default)\&. +.RE +.RE +.PP +push\&.followTags +.RS 4 +If set to true enable +\fB\-\-follow\-tags\fR +option by default\&. You may override this configuration at time of push by specifying +\fB\-\-no\-follow\-tags\fR\&. +.RE +.PP +push\&.gpgSign +.RS 4 +May be set to a boolean value, or the string +\fIif\-asked\fR\&. A true value causes all pushes to be GPG signed, as if +\fB\-\-signed\fR +is passed to +\fBgit-push\fR(1)\&. The string +\fIif\-asked\fR +causes pushes to be signed if the server supports it, as if +\fB\-\-signed=if\-asked\fR +is passed to +\fIgit push\fR\&. A false value may override a value from a lower\-priority config file\&. An explicit command\-line flag always overrides this config option\&. +.RE +.PP +push\&.pushOption +.RS 4 +When no +\fB\-\-push\-option=