diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-23 14:45:58 -0700 |
| commit | b6372084f858f691ddb2964c4be8472fd62a93a2 (patch) | |
| tree | 230ac84650905c477af7ce5dcb029aa74102ac8d | |
| parent | de2d9f3304febd6da7d7c63f2dbd49471eb2a2d8 (diff) | |
| download | git-manpages-b6372084f858f691ddb2964c4be8472fd62a93a2.tar.gz | |
Autogenerated manpages for v2.42.0-482-g2e8e7
195 files changed, 1224 insertions, 1160 deletions
diff --git a/man1/git-add.1 b/man1/git-add.1 index 39726ec22..9c8fbd7d9 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-ADD" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-ADD" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-am.1 b/man1/git-am.1 index d06b0f79c..505c60bf2 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-AM" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-AM" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ git-am \- Apply a series of patches from a mailbox .sp .SH "DESCRIPTION" .sp -Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch\&. You could think of it as a reverse operation of \fBgit-format-patch\fR(1) run on a branch with a straight history without merges\&. +Splits mail messages in a mailbox into commit log messages, authorship information, and patches, and applies them to the current branch\&. You could think of it as a reverse operation of \fBgit-format-patch\fR(1) run on a branch with a straight history without merges\&. .SH "OPTIONS" .PP (<mbox>|<Maildir>)\&... @@ -122,7 +122,7 @@ This flag will be passed down to \-\-empty=(stop|drop|keep) .RS 4 By default, or when the option is set to -\fIstop\fR, the command errors out on an input e\-mail message lacking a patch and stops into the middle of the current am session\&. When this option is set to +\fIstop\fR, the command errors out on an input e\-mail message lacking a patch and stops in the middle of the current am session\&. When this option is set to \fIdrop\fR, skip such an e\-mail message instead\&. When this option is set to \fIkeep\fR, create an empty commit, recording the contents of the e\-mail message as its log\&. .RE @@ -161,7 +161,7 @@ flag to (see \fBgit-mailinfo\fR(1))\&. The proposed commit log message taken from the e\-mail is re\-coded into UTF\-8 encoding (configuration variable \fBi18n\&.commitEncoding\fR -can be used to specify project\(cqs preferred encoding if it is not UTF\-8)\&. +can be used to specify the project\(cqs preferred encoding if it is not UTF\-8)\&. .sp This was optional in prior versions of git, but now it is the default\&. You can use \fB\-\-no\-utf8\fR @@ -206,7 +206,7 @@ These flags are passed to the .PP \-\-patch\-format .RS 4 -By default the command will try to detect the patch format automatically\&. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as\&. Valid formats are mbox, mboxrd, stgit, stgit\-series and hg\&. +By default the command will try to detect the patch format automatically\&. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as\&. Valid formats are mbox, mboxrd, stgit, stgit\-series, and hg\&. .RE .PP \-i, \-\-interactive @@ -270,7 +270,7 @@ and .PP \-\-abort .RS 4 -Restore the original branch and abort the patching operation\&. Revert contents of files involved in the am operation to their pre\-am state\&. +Restore the original branch and abort the patching operation\&. Revert the contents of files involved in the am operation to their pre\-am state\&. .RE .PP \-\-quit diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index 7cbc56f09..0976046e9 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 8eed0c00e..e8f0cbd9c 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-APPLY" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-APPLY" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -44,7 +44,7 @@ git-apply \- Apply a patch to files and/or to the index .sp .SH "DESCRIPTION" .sp -Reads the supplied diff output (i\&.e\&. "a patch") and applies it to files\&. When running from a subdirectory in a repository, patched paths outside the directory are ignored\&. With the \fB\-\-index\fR option the patch is also applied to the index, and with the \fB\-\-cached\fR option the patch is only applied to the index\&. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository\&. +Reads the supplied diff output (i\&.e\&. "a patch") and applies it to files\&. When running from a subdirectory in a repository, patched paths outside the directory are ignored\&. With the \fB\-\-index\fR option, the patch is also applied to the index, and with the \fB\-\-cached\fR option, the patch is only applied to the index\&. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository\&. .sp This command applies the patch but does not create a commit\&. Use \fBgit-am\fR(1) to create commits from patches generated by \fBgit-format-patch\fR(1) and/or received by email\&. .SH "OPTIONS" @@ -72,7 +72,7 @@ instead of saying .PP \-\-summary .RS 4 -Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes\&. Turns off "apply"\&. +Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames, and mode changes\&. Turns off "apply"\&. .RE .PP \-\-check @@ -181,7 +181,7 @@ expects that the patch being applied is a unified diff with at least one line of \fB\-\-unified=0\fR\&. To bypass these checks use \fB\-\-unidiff\-zero\fR\&. .sp -Note, for the reasons stated above usage of context\-free patches is discouraged\&. +Note, for the reasons stated above, the usage of context\-free patches is discouraged\&. .RE .PP \-\-apply @@ -201,7 +201,7 @@ on them and applying the result with this option, which would apply the deletion .PP \-\-allow\-binary\-replacement, \-\-binary .RS 4 -Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so\&. Currently we always allow binary patch application, so this is a no\-op\&. +Historically we did not allow binary patch application without an explicit permission from the user, and this flag was the way to do so\&. Currently, we always allow binary patch application, so this is a no\-op\&. .RE .PP \-\-exclude=<path\-pattern> @@ -363,7 +363,7 @@ is in use\&. .PP \-\-allow\-empty .RS 4 -Don\(cqt return error for patches containing no diff\&. This includes empty patches and patches with commit text only\&. +Don\(cqt return an error for patches containing no diff\&. This includes empty patches and patches with commit text only\&. .RE .SH "CONFIGURATION" .sp @@ -376,7 +376,7 @@ When set to \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 +option\&. When set to one of: no, none, never, false, it tells \fIgit apply\fR to respect all whitespace differences\&. See \fBgit-apply\fR(1)\&. @@ -386,7 +386,7 @@ apply\&.whitespace .RS 4 Tells \fIgit apply\fR -how to handle whitespaces, in the same way as the +how to handle whitespace, in the same way as the \fB\-\-whitespace\fR option\&. See \fBgit-apply\fR(1)\&. diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index e32d2da4a..3aae3f10e 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 91d71066a..bb0a396e6 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ git-archive \- Create an archive of files from a named tree .sp Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output\&. If <prefix> is specified it is prepended to the filenames in the archive\&. .sp -\fIgit archive\fR behaves differently when given a tree ID versus when given a commit ID or tag ID\&. In the first case the current time is used as the modification time of each file in the archive\&. In the latter case the commit time as recorded in the referenced commit object is used instead\&. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using \fIgit get\-tar\-commit\-id\fR\&. In ZIP files it is stored as a file comment\&. +\fIgit archive\fR behaves differently when given a tree ID as opposed to a commit ID or tag ID\&. When a tree ID is provided, the current time is used as the modification time of each file in the archive\&. On the other hand, when a commit ID or tag ID is provided, the commit time as recorded in the referenced commit object is used instead\&. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using \fIgit get\-tar\-commit\-id\fR\&. In ZIP files it is stored as a file comment\&. .SH "OPTIONS" .PP \-\-format=<fmt> diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index 13e6911c7..a733bdbaa 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-BISECT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-BISECT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index f69670827..6d1804fa2 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-BLAME" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-BLAME" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -357,7 +357,7 @@ Suppress the author name and timestamp from the output\&. .PP \-e, \-\-show\-email .RS 4 -Show the author email instead of author name (Default: off)\&. This can also be controlled via the +Show the author email instead of the author name (Default: off)\&. This can also be controlled via the \fBblame\&.showEmail\fR config option\&. .RE @@ -394,7 +394,7 @@ abbreviated object name for the commit the line came from; .sp -1 .IP \(bu 2.3 .\} -author ident (by default author name and date, unless +author ident (by default the author name and date, unless \fB\-s\fR or \fB\-e\fR @@ -496,7 +496,7 @@ the filename in the commit that the line is attributed to\&. the first line of the commit log message ("summary")\&. .RE .sp -The contents of the actual line is output after the above header, prefixed by a TAB\&. This is to allow adding more header elements later\&. +The contents of the actual line are output after the above header, prefixed by a TAB\&. This is to allow adding more header elements later\&. .sp The porcelain format generally suppresses commit information that has already been seen\&. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once\&. This is more efficient, but may require more state be kept by the reader\&. The \fB\-\-line\-porcelain\fR option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like: .sp diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 74e793d22..750bf6b08 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-BRANCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -472,7 +472,7 @@ When on branch <name>, 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 +which remote to fetch from or 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\&.<name>\&.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 @@ -506,7 +506,7 @@ which branch to merge and can also affect \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\&.<name>\&.remote"\&. The merge information is used by \fIgit pull\fR -(which at first calls +(which 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 @@ -552,7 +552,7 @@ for details)\&. branch\&.<name>\&.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\&. +\fBgit branch \-\-edit\-description\fR\&. Branch description is automatically added to the format\-patch cover letter or request\-pull summary\&. .RE .SH "EXAMPLES" .PP diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index 6ea87d635..6c4693cd0 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -38,7 +38,7 @@ git-bugreport \- Collect information for user to file a bug report .sp .SH "DESCRIPTION" .sp -Captures information about the user\(cqs machine, Git client, and repository state, as well as a form requesting information about the behavior the user observed, into a single text file which the user can then share, for example to the Git mailing list, in order to report an observed bug\&. +Collects information about the user\(cqs machine, Git client, and repository state, in addition to a form requesting information about the behavior the user observed, and stores it in a single text file which the user can then share, for example to the Git mailing list, in order to report an observed bug\&. .sp The following information is requested from the user: .sp diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index 2d5579516..697b504e0 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-BUNDLE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index 7b5ef3630..cd231433e 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 8d53dfd09..4dd23a061 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -57,7 +57,7 @@ in the index only, ignoring the working tree\&. .PP \-\-stdin .RS 4 -Read pathnames from the standard input, one per line, instead of from the command\-line\&. +Read pathnames from the standard input, one per line, instead of from the command line\&. .RE .PP \-z @@ -69,7 +69,7 @@ is also given, input paths are separated with a NUL character instead of a linef .PP \-\-source=<tree\-ish> .RS 4 -Check attributes against the specified tree\-ish\&. It is common to specify the source tree by naming a commit, branch or tag associated with it\&. +Check attributes against the specified tree\-ish\&. It is common to specify the source tree by naming a commit, branch, or tag associated with it\&. .RE .PP \-\- @@ -84,7 +84,7 @@ The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF .sp unless \fB\-z\fR is in effect, in which case NUL is used as delimiter: <path> NUL <attribute> NUL <info> NUL .sp -<path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either: +<path> is the path of a file being queried, <attribute> is an attribute being queried, and <info> can be either: .PP \fIunspecified\fR .RS 4 diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index a2eab5e67..f5640ec4d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index d1fa6f0d9..6eb9c15ca 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 80b375797..f455c7fc8 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -137,7 +137,7 @@ They cannot begin or end with a slash \fB/\fR or contain multiple consecutive slashes (see the \fB\-\-normalize\fR -option below for an exception to this rule) +option below for an exception to this rule)\&. .RE .sp .RS 4 @@ -257,7 +257,7 @@ at\-open\-brace is used as a notation to access a reflog entry\&. .RE .sp -With the \fB\-\-branch\fR option, the command takes a name and checks if it can be used as a valid branch name (e\&.g\&. when creating a new branch)\&. But be cautious when using the previous checkout syntax that may refer to a detached HEAD state\&. The rule \fBgit check\-ref\-format \-\-branch $name\fR implements may be stricter than what \fBgit check\-ref\-format refs/heads/$name\fR says (e\&.g\&. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name)\&. When run with \fB\-\-branch\fR option in a repository, the input is first expanded for the \(lqprevious checkout syntax\(rq \fB@{\-n}\fR\&. For example, \fB@{\-1}\fR is a way to refer the last thing that was checked out using "git switch" or "git checkout" operation\&. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name\&. As an exception note that, the \(lqprevious checkout operation\(rq might result in a commit object name when the N\-th last thing checked out was not a branch\&. +With the \fB\-\-branch\fR option, the command takes a name and checks if it can be used as a valid branch name (e\&.g\&. when creating a new branch)\&. But be cautious when using the previous checkout syntax that may refer to a detached HEAD state\&. The rule \fBgit check\-ref\-format \-\-branch $name\fR implements may be stricter than what \fBgit check\-ref\-format refs/heads/$name\fR says (e\&.g\&. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name)\&. When run with the \fB\-\-branch\fR option in a repository, the input is first expanded for the \(lqprevious checkout syntax\(rq \fB@{\-n}\fR\&. For example, \fB@{\-1}\fR is a way to refer the last thing that was checked out using "git switch" or "git checkout" operation\&. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name\&. As an exception note that, the \(lqprevious checkout operation\(rq might result in a commit object name when the N\-th last thing checked out was not a branch\&. .SH "OPTIONS" .PP \-\-[no\-]allow\-onelevel diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 289c0dddf..f9cf1ad7f 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ git-checkout-index \- Copy files from the index to the working tree .sp .SH "DESCRIPTION" .sp -Will copy all files listed from the index to the working directory (not overwriting existing files)\&. +Copies all listed files from the index to the working directory (not overwriting existing files)\&. .SH "OPTIONS" .PP \-u, \-\-index @@ -78,12 +78,12 @@ When creating files, prepend <string> (usually a directory including a trailing .PP \-\-stage=<number>|all .RS 4 -Instead of checking out unmerged entries, copy out the files from named stage\&. <number> must be between 1 and 3\&. Note: \-\-stage=all automatically implies \-\-temp\&. +Instead of checking out unmerged entries, copy out the files from the named stage\&. <number> must be between 1 and 3\&. Note: \-\-stage=all automatically implies \-\-temp\&. .RE .PP \-\-temp .RS 4 -Instead of copying the files to the working directory write the content to temporary files\&. The temporary name associations will be written to stdout\&. +Instead of copying the files to the working directory, write the content to temporary files\&. The temporary name associations will be written to stdout\&. .RE .PP \-\-ignore\-skip\-worktree\-bits @@ -93,7 +93,7 @@ Check out all files, including those with the skip\-worktree bit set\&. .PP \-\-stdin .RS 4 -Instead of taking list of paths from the command line, read list of paths from the standard input\&. Paths are separated by LF (i\&.e\&. one path per line) by default\&. +Instead of taking a list of paths from the command line, read the list of paths from the standard input\&. Paths are separated by LF (i\&.e\&. one path per line) by default\&. .RE .PP \-z diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index 4f3326d00..88159ccfc 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -73,7 +73,7 @@ $ git checkout \-b <branch> \-\-track <remote>/<branch> .\} .sp You could omit -\fB<branch>\fR, in which case the command degenerates to "check out the current branch", which is a glorified no\-op with rather expensive side\-effects to show only the tracking information, if exists, for the current branch\&. +\fB<branch>\fR, in which case the command degenerates to "check out the current branch", which is a glorified no\-op with rather expensive side\-effects to show only the tracking information, if it exists, for the current branch\&. .RE .PP \fIgit checkout\fR \-b|\-B <new\-branch> [<start\-point>] @@ -918,12 +918,12 @@ The number of parallel workers to use when updating the working tree\&. The defa \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\&. +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\&. +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 you to define the minimum number of files for which parallel checkout should be attempted\&. The default is 100\&. .RE .SH "SEE ALSO" .sp diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index a8acf7fea..0ccfec7b0 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index 9b845d326..e1328df6d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CHERRY" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index 430800d65..7afa70369 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CITOOL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index d2c85e6ad..9e1c5acb1 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CLEAN" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -124,7 +124,7 @@ Start cleaning files and directories, and then quit\&. .PP filter by pattern .RS 4 -This shows the files and directories to be deleted and issues an "Input ignore patterns>>" prompt\&. You can input space\-separated patterns to exclude files and directories from deletion\&. E\&.g\&. "*\&.c *\&.h" will excludes files end with "\&.c" and "\&.h" from deletion\&. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu\&. +This shows the files and directories to be deleted and issues an "Input ignore patterns>>" prompt\&. You can input space\-separated patterns to exclude files and directories from deletion\&. E\&.g\&. "*\&.c *\&.h" will exclude files ending with "\&.c" and "\&.h" from deletion\&. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu\&. .RE .PP select by numbers @@ -156,7 +156,7 @@ Everything below this line in this section is selectively included from the \fBg .PP clean\&.requireForce .RS 4 -A boolean to make git\-clean do nothing unless given \-f, \-i or \-n\&. Defaults to true\&. +A boolean to make git\-clean do nothing unless given \-f, \-i, or \-n\&. Defaults to true\&. .RE .SH "SEE ALSO" .sp diff --git a/man1/git-clone.1 b/man1/git-clone.1 index cd93af6b1..7bf764573 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CLONE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CLONE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -400,7 +400,7 @@ namespace\&. This option is incompatible with .sp In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository\&. Depending on the transport protocol, some of this information may be absent\&. .sp -Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)\&. +Git supports ssh, git, http, and https protocols (in addition, ftp and ftps can be used for fetching, but this is inefficient and deprecated; do not use them)\&. .sp The native transport (i\&.e\&. git:// URL) does no authentication and should be used with caution on unsecured networks\&. .sp @@ -725,9 +725,9 @@ command\-line option to .PP clone\&.rejectShallow .RS 4 -Reject to clone a repository if it is a shallow one, can be overridden by passing option +Reject cloning a repository if it is a shallow one; this can be overridden by passing the \fB\-\-reject\-shallow\fR -in command line\&. See +option on the command line\&. See \fBgit-clone\fR(1) .RE .PP diff --git a/man1/git-column.1 b/man1/git-column.1 index bd1afd678..f96d47d25 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-COLUMN" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -203,7 +203,7 @@ for details\&. .PP column\&.clean .RS 4 -Specify the layout when list items in +Specify the layout when listing items in \fBgit clean \-i\fR, which always shows files and directories in columns\&. See \fBcolumn\&.ui\fR for details\&. @@ -220,7 +220,7 @@ for details\&. .PP column\&.tag .RS 4 -Specify whether to output tag listing in +Specify whether to output tag listings in \fBgit tag\fR in columns\&. See \fBcolumn\&.ui\fR diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index 79f159308..9d04aa51d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index d4e80fd93..230d5112a 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -234,7 +234,7 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t \fIgit commit\fR and \fIgit commit\-tree\fR -issues a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have +issue a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have \fBi18n\&.commitEncoding\fR in \fB\&.git/config\fR @@ -253,7 +253,7 @@ file, like this: .sp Commit objects created with the above setting record the value of \fBi18n\&.commitEncoding\fR -in its +in their \fBencoding\fR header\&. This is to help other people who look at them later\&. Lack of this header implies that the commit log message is encoded in UTF\-8\&. .RE diff --git a/man1/git-commit.1 b/man1/git-commit.1 index db38fbae9..0073a82b5 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-COMMIT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -847,7 +847,7 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t \fIgit commit\fR and \fIgit commit\-tree\fR -issues a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have +issue a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have \fBi18n\&.commitEncoding\fR in \fB\&.git/config\fR @@ -866,7 +866,7 @@ file, like this: .sp Commit objects created with the above setting record the value of \fBi18n\&.commitEncoding\fR -in its +in their \fBencoding\fR header\&. This is to help other people who look at them later\&. Lack of this header implies that the commit log message is encoded in UTF\-8\&. .RE @@ -920,7 +920,7 @@ This setting overrides the default of the 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 +for details\&. Changing the default can be useful when you always want to keep lines that begin with the comment character \fB#\fR in your log message, in which case you would do \fBgit config commit\&.cleanup whitespace\fR @@ -946,7 +946,7 @@ Specify the pathname of a file to use as the template for new commit messages\&. .PP commit\&.verbose .RS 4 -A boolean or int to specify the level of verbose with +A boolean or int to specify the level of verbosity with \fBgit commit\fR\&. See \fBgit-commit\fR(1)\&. .RE diff --git a/man1/git-config.1 b/man1/git-config.1 index f54641b11..c75f01a3c 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CONFIG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -857,7 +857,7 @@ http\&.sslverify false .sp The Git configuration file contains a number of variables that affect the Git commands\*(Aq behavior\&. The files \fB\&.git/config\fR and optionally \fBconfig\&.worktree\fR (see the "CONFIGURATION FILE" section of \fBgit-worktree\fR(1)) in each repository are used to store the configuration for that repository, and \fB$HOME/\&.gitconfig\fR is used to store a per\-user configuration as fallback values for the \fB\&.git/config\fR file\&. The file \fB/etc/gitconfig\fR can be used to store a system\-wide default configuration\&. .sp -The configuration variables are used by both the Git plumbing and the porcelains\&. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot\-separated segment and the section name is everything before the last dot\&. The variable names are case\-insensitive, allow only alphanumeric characters and \fB\-\fR, and must start with an alphabetic character\&. Some variables may appear multiple times; we say then that the variable is multivalued\&. +The configuration variables are used by both the Git plumbing and the porcelain commands\&. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot\-separated segment and the section name is everything before the last dot\&. The variable names are case\-insensitive, allow only alphanumeric characters and \fB\-\fR, and must start with an alphabetic character\&. Some variables may appear multiple times; we say then that the variable is multivalued\&. .SS "Syntax" .sp The syntax is fairly flexible and permissive; whitespaces are mostly ignored\&. The \fI#\fR and \fI;\fR characters begin comments to the end of line, blank lines are ignored\&. @@ -897,7 +897,7 @@ You can include a config file from another by setting the special \fBinclude\&.p The contents of the included file are inserted immediately, as if they had been found at the location of the include directive\&. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found\&. See below for examples\&. .SS "Conditional includes" .sp -You can include a config file from another conditionally by setting a \fBincludeIf\&.<condition>\&.path\fR variable to the name of the file to be included\&. +You can conditionally include a config file from another by setting an \fBincludeIf\&.<condition>\&.path\fR variable to the name of the file to be included\&. .sp The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword\&. Supported keywords are: .PP @@ -909,7 +909,7 @@ is used as a glob pattern\&. If the location of the \&.git directory matches the .sp The \&.git location may be auto\-discovered, or come from \fB$GIT_DIR\fR -environment variable\&. If the repository is auto discovered via a \&.git file (e\&.g\&. from submodules, or a linked worktree), the \&.git location would be the final location where the \&.git directory is, not where the \&.git file is\&. +environment variable\&. If the repository is auto\-discovered via a \&.git file (e\&.g\&. from submodules, or a linked worktree), the \&.git location would be the final location where the \&.git directory is, not where the \&.git file is\&. .sp The pattern can contain standard globbing wildcards and two additional ones, \fB**/\fR @@ -1283,7 +1283,7 @@ variables default to .PP ambiguousFetchRefspec .RS 4 -Advice shown when fetch refspec for multiple remotes map to the same remote\-tracking branch namespace and causes branch tracking set\-up to fail\&. +Advice shown when a fetch refspec for multiple remotes maps to the same remote\-tracking branch namespace and causes branch tracking set\-up to fail\&. .RE .PP fetchShowForcedUpdates @@ -1385,7 +1385,7 @@ Show directions on how to proceed from the current state in the output of \fBgit-switch\fR(1) or \fBgit-checkout\fR(1) -when switching branch\&. +when switching branches\&. .RE .PP statusUoption @@ -1434,7 +1434,7 @@ Advice shown when you used \fBgit-switch\fR(1) or \fBgit-checkout\fR(1) -to move to the detach HEAD state, to instruct how to create a local branch after the fact\&. +to move to the detached HEAD state, to instruct how to create a local branch after the fact\&. .RE .PP suggestDetachingHead @@ -1454,7 +1454,7 @@ and \fBgit-switch\fR(1) ambiguously resolves to a remote tracking branch on more than one remote in situations where an unambiguous argument would have otherwise caused a remote\-tracking branch to be checked out\&. See the \fBcheckout\&.defaultRemote\fR -configuration variable for how to set a given remote to used by default in some situations where this advice would be printed\&. +configuration variable for how to set a given remote to be used by default in some situations where this advice would be printed\&. .RE .PP amWorkDir @@ -2662,7 +2662,7 @@ command wrapper \- e\&.g\&. after defining \fBalias\&.last = cat\-file commit HEAD\fR, the invocation \fBgit last\fR is equivalent to -\fBgit cat\-file commit HEAD\fR\&. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored\&. Arguments are split by spaces, the usual shell quoting and escaping is supported\&. A quote pair or a backslash can be used to quote them\&. +\fBgit cat\-file commit HEAD\fR\&. To avoid confusion and troubles with script usage, aliases that hide existing Git commands are ignored\&. Arguments are split by spaces, the usual shell quoting and escaping are supported\&. A quote pair or a backslash can be used to quote them\&. .sp Note that the first word of an alias does not necessarily have to be a command\&. It can be a command\-line option that will be passed into the invocation of \fBgit\fR\&. In particular, this is useful when used with @@ -2727,7 +2727,7 @@ When set to \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 +option\&. When set to one of: no, none, never, false, it tells \fIgit apply\fR to respect all whitespace differences\&. See \fBgit-apply\fR(1)\&. @@ -2737,7 +2737,7 @@ apply\&.whitespace .RS 4 Tells \fIgit apply\fR -how to handle whitespaces, in the same way as the +how to handle whitespace, in the same way as the \fB\-\-whitespace\fR option\&. See \fBgit-apply\fR(1)\&. @@ -2853,7 +2853,7 @@ When on branch <name>, 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 +which remote to fetch from or 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\&.<name>\&.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 @@ -2887,7 +2887,7 @@ which branch to merge and can also affect \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\&.<name>\&.remote"\&. The merge information is used by \fIgit pull\fR -(which at first calls +(which 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 @@ -2933,7 +2933,7 @@ for details)\&. branch\&.<name>\&.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\&. +\fBgit branch \-\-edit\-description\fR\&. Branch description is automatically added to the format\-patch cover letter or request\-pull summary\&. .RE .PP browser\&.<tool>\&.cmd @@ -3049,17 +3049,17 @@ The number of parallel workers to use when updating the working tree\&. The defa \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\&. +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\&. +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 you to define the minimum number of files for which parallel checkout should be attempted\&. The default is 100\&. .RE .PP clean\&.requireForce .RS 4 -A boolean to make git\-clean do nothing unless given \-f, \-i or \-n\&. Defaults to true\&. +A boolean to make git\-clean do nothing unless given \-f, \-i, or \-n\&. Defaults to true\&. .RE .PP clone\&.defaultRemoteName @@ -3073,9 +3073,9 @@ command\-line option to .PP clone\&.rejectShallow .RS 4 -Reject to clone a repository if it is a shallow one, can be overridden by passing option +Reject cloning a repository if it is a shallow one; this can be overridden by passing the \fB\-\-reject\-shallow\fR -in command line\&. See +option on the command line\&. See \fBgit-clone\fR(1) .RE .PP @@ -3331,8 +3331,7 @@ matching text in selected lines\&. Also, used to customize the following \fBgit-log\fR(1) subcommands: \fB\-\-grep\fR, -\fB\-\-author\fR -and +\fB\-\-author\fR, and \fB\-\-committer\fR\&. .RE .PP @@ -3614,7 +3613,7 @@ for details\&. .PP column\&.clean .RS 4 -Specify the layout when list items in +Specify the layout when listing items in \fBgit clean \-i\fR, which always shows files and directories in columns\&. See \fBcolumn\&.ui\fR for details\&. @@ -3631,7 +3630,7 @@ for details\&. .PP column\&.tag .RS 4 -Specify whether to output tag listing in +Specify whether to output tag listings in \fBgit tag\fR in columns\&. See \fBcolumn\&.ui\fR @@ -3645,7 +3644,7 @@ This setting overrides the default of the 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 +for details\&. Changing the default can be useful when you always want to keep lines that begin with the comment character \fB#\fR in your log message, in which case you would do \fBgit config commit\&.cleanup whitespace\fR @@ -3671,7 +3670,7 @@ Specify the pathname of a file to use as the template for new commit messages\&. .PP commit\&.verbose .RS 4 -A boolean or int to specify the level of verbose with +A boolean or int to specify the level of verbosity with \fBgit commit\fR\&. See \fBgit-commit\fR(1)\&. .RE @@ -3723,7 +3722,7 @@ If no username is set for a network authentication, use this username by default .PP credential\&.<url>\&.* .RS 4 -Any of the credential\&.* options above can be applied selectively to some credentials\&. For example "credential\&.https://example\&.com\&.username" would set the default username only for https connections to example\&.com\&. See +Any of the credential\&.* options above can be applied selectively to some credentials\&. For example, "credential\&.https://example\&.com\&.username" would set the default username only for https connections to example\&.com\&. See \fBgitcredentials\fR(7) for details on how URLs are matched\&. .RE @@ -3735,7 +3734,7 @@ Tell git\-credential\-cache\(emdaemon to ignore SIGHUP, instead of quitting\&. .PP credentialStore\&.lockTimeoutMS .RS 4 -The length of time, in milliseconds, for git\-credential\-store to retry when trying to lock the credentials file\&. Value 0 means not to retry at all; \-1 means to try indefinitely\&. Default is 1000 (i\&.e\&., retry for 1s)\&. +The length of time, in milliseconds, for git\-credential\-store to retry when trying to lock the credentials file\&. A value of 0 means not to retry at all; \-1 means to try indefinitely\&. Default is 1000 (i\&.e\&., retry for 1s)\&. .RE .PP completion\&.commands @@ -3749,7 +3748,7 @@ 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 +to compare with work tree files, do not consider stat\-only changes 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 @@ -4370,7 +4369,7 @@ 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 +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 @@ -4536,9 +4535,9 @@ Control how ref update status is printed\&. Valid values are \fBfull\fR and \fBcompact\fR\&. Default value is -\fBfull\fR\&. See section OUTPUT in +\fBfull\fR\&. See the OUTPUT section in \fBgit-fetch\fR(1) -for detail\&. +for details\&. .RE .PP fetch\&.negotiationAlgorithm @@ -4708,7 +4707,7 @@ Encode email headers that have non\-ASCII characters with "Q\-encoding" (describ .PP format\&.pretty .RS 4 -The default pretty format for log/show/whatchanged command, See +The default pretty format for log/show/whatchanged command\&. See \fBgit-log\fR(1), \fBgit-show\fR(1), \fBgit-whatchanged\fR(1)\&. @@ -4866,19 +4865,18 @@ The rest of the documentation discusses for brevity, but the same applies for the corresponding \fBreceive\&.fsck\&.*\fR and -\fBfetch\&.<msg\-id>\&.*\fR\&. variables\&. +\fBfetch\&.fsck\&.*\fR\&. variables\&. .sp Unlike variables like \fBcolor\&.ui\fR and -\fBcore\&.editor\fR -the +\fBcore\&.editor\fR, the \fBreceive\&.fsck\&.<msg\-id>\fR and \fBfetch\&.fsck\&.<msg\-id>\fR variables will not fall back on the \fBfsck\&.<msg\-id>\fR -configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances all three of them they must all set to the same values\&. +configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances, all three of them must be set to the same values\&. .sp When \fBfsck\&.<msg\-id>\fR @@ -4905,7 +4903,7 @@ and \fBfetch\&.fsck\&.<msg\-id>\fR will only cause git to warn\&. .sp -See +See the \fBFsck Messages\fR section of \fBgit-fsck\fR(1) @@ -4915,9 +4913,9 @@ for supported values of .PP fsck\&.skipList .RS 4 -The path to a list of object names (i\&.e\&. one unabbreviated SHA\-1 per line) that are known to be broken in a non\-fatal way and should be ignored\&. On versions of Git 2\&.20 and later comments (\fI#\fR), empty lines, and any leading and trailing whitespace is ignored\&. Everything but a SHA\-1 per line will error out on older versions\&. +The path to a list of object names (i\&.e\&. one unabbreviated SHA\-1 per line) that are known to be broken in a non\-fatal way and should be ignored\&. On versions of Git 2\&.20 and later, comments (\fI#\fR), empty lines, and any leading and trailing whitespace are ignored\&. Everything but a SHA\-1 per line will error out on older versions\&. .sp -This feature is useful when an established project should be accepted despite early commits containing errors that can be safely ignored such as invalid committer email addresses\&. Note: corrupt objects cannot be skipped with this setting\&. +This feature is useful when an established project should be accepted despite early commits containing errors that can be safely ignored, such as invalid committer email addresses\&. Note: corrupt objects cannot be skipped with this setting\&. .sp Like \fBfsck\&.<msg\-id>\fR @@ -4937,14 +4935,14 @@ and \fBfetch\&.fsck\&.skipList\fR variables will not fall back on the \fBfsck\&.skipList\fR -configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances all three of them they must all set to the same values\&. +configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances, all three of them must be set to the same values\&. .sp -Older versions of Git (before 2\&.20) documented that the object names list should be sorted\&. This was never a requirement, the object names could appear in any order, but when reading the list we tracked whether the list was sorted for the purposes of an internal binary search implementation, which could save itself some work with an already sorted list\&. Unless you had a humongous list there was no reason to go out of your way to pre\-sort the list\&. After Git version 2\&.20 a hash implementation is used instead, so there\(cqs now no reason to pre\-sort the list\&. +Older versions of Git (before 2\&.20) documented that the object names list should be sorted\&. This was never a requirement; the object names could appear in any order, but when reading the list we tracked whether the list was sorted for the purposes of an internal binary search implementation, which could save itself some work with an already sorted list\&. Unless you had a humongous list there was no reason to go out of your way to pre\-sort the list\&. After Git version 2\&.20 a hash implementation is used instead, so there\(cqs now no reason to pre\-sort the list\&. .RE .PP fsmonitor\&.allowRemote .RS 4 -By default, the fsmonitor daemon refuses to work against network\-mounted repositories\&. Setting +By default, the fsmonitor daemon refuses to work with network\-mounted repositories\&. Setting \fBfsmonitor\&.allowRemote\fR to \fBtrue\fR @@ -4998,7 +4996,7 @@ When there are approximately more than this many loose objects in the repository \fBgit gc \-\-auto\fR will pack them\&. Some Porcelain commands use this command to perform a light\-weight garbage collection from time to time\&. The default value is 6700\&. .sp -Setting this to 0 disables not only automatic packing based on the number of loose objects, but any other heuristic +Setting this to 0 disables not only automatic packing based on the number of loose objects, but also any other heuristic \fBgit gc \-\-auto\fR will otherwise use to determine if there\(cqs work to do, such as \fBgc\&.autoPackLimit\fR\&. @@ -5023,7 +5021,7 @@ gc\&.autoDetach .RS 4 Make \fBgit gc \-\-auto\fR -return immediately and run in background if the system supports it\&. Default is true\&. +return immediately and run in the background if the system supports it\&. Default is true\&. .RE .PP gc\&.bigPackThreshold @@ -5355,7 +5353,7 @@ gpg\&.program .RS 4 Use this custom program instead of "\fBgpg\fR" found on \fB$PATH\fR -when making or verifying a PGP signature\&. The program must support the same command\-line interface as GPG, namely, to verify a detached signature, "\fBgpg \-\-verify $signature \- <$file\fR" is run, and the program is expected to signal a good signature by exiting with code 0, and to generate an ASCII\-armored detached signature, the standard input of "\fBgpg \-bsau $key\fR" is fed with the contents to be signed, and the program is expected to send the result to its standard output\&. +when making or verifying a PGP signature\&. The program must support the same command\-line interface as GPG, namely, to verify a detached signature, "\fBgpg \-\-verify $signature \- <$file\fR" is run, and the program is expected to signal a good signature by exiting with code 0\&. To generate an ASCII\-armored detached signature, the standard input of "\fBgpg \-bsau $key\fR" is fed with the contents to be signed, and the program is expected to send the result to its standard output\&. .RE .PP gpg\&.format @@ -5386,7 +5384,7 @@ is "ssh\-keygen"\&. .PP gpg\&.minTrustLevel .RS 4 -Specifies a minimum trust level for signature verification\&. If this option is unset, then signature verification for merge operations require a key with at least +Specifies a minimum trust level for signature verification\&. If this option is unset, then signature verification for merge operations requires a key with at least \fBmarginal\fR trust\&. Other operations that perform signature verification require a key with at least \fBundefined\fR @@ -5450,7 +5448,7 @@ trust\&. Setting this option overrides the required trust\-level for all operati .PP gpg\&.ssh\&.defaultKeyCommand .RS 4 -This command that will be run when user\&.signingkey is not set and a ssh signature is requested\&. On successful exit a valid ssh public key prefixed with +This command will be run when user\&.signingkey is not set and a ssh signature is requested\&. On successful exit a valid ssh public key prefixed with \fBkey::\fR is expected in the first line of its output\&. This allows for a script doing a dynamic lookup of the correct public key when it is impractical to statically configure \fBuser\&.signingKey\fR\&. For example when keys or SSH Certificates are rotated frequently or selection of the right key depends on external factors unknown to git\&. @@ -5521,7 +5519,7 @@ should default to tracking remote branches with matching names or not\&. Default .PP gui\&.newBranchTemplate .RS 4 -Is used as suggested name when creating new branches using the +Is used as a suggested name when creating new branches using the \fBgit-gui\fR(1)\&. .RE .PP @@ -6196,14 +6194,14 @@ environment variables\&. .PP http\&.noEPSV .RS 4 -A boolean which disables using of EPSV ftp command by curl\&. This can helpful with some "poor" ftp servers which don\(cqt support EPSV mode\&. Can be overridden by the +A boolean which disables using of EPSV ftp command by curl\&. This can be helpful with some "poor" ftp servers which don\(cqt support EPSV mode\&. Can be overridden by the \fBGIT_CURL_FTP_NO_EPSV\fR environment variable\&. Default is false (curl will use EPSV)\&. .RE .PP http\&.userAgent .RS 4 -The HTTP USER_AGENT string presented to an HTTP server\&. The default value represents the version of the client Git such as git/1\&.7\&.1\&. This option allows you to override this value to a more common value such as Mozilla/4\&.0\&. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1\&.7\&.1)\&. Can be overridden by the +The HTTP USER_AGENT string presented to an HTTP server\&. The default value represents the version of the Git client such as git/1\&.7\&.1\&. This option allows you to override this value to a more common value such as Mozilla/4\&.0\&. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set of common USER_AGENT strings (but not including those like git/1\&.7\&.1)\&. Can be overridden by the \fBGIT_HTTP_USER_AGENT\fR environment variable\&. .RE @@ -6317,7 +6315,7 @@ All URLs are normalized before attempting any matching (the password part, if em .PP i18n\&.commitEncoding .RS 4 -Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e\&.g\&. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains)\&. See e\&.g\&. +Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e\&.g\&. when importing commits from emails or in the gitk graphical history browser (and possibly in other places in the future or in other porcelains)\&. See e\&.g\&. \fBgit-mailinfo\fR(1)\&. Defaults to \fIutf\-8\fR\&. .RE @@ -6336,7 +6334,7 @@ The folder to drop the mails into, which is typically the Drafts folder\&. For e .PP imap\&.tunnel .RS 4 -Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server\&. Required when imap\&.host is not set\&. +Command used to set up a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server\&. Required when imap\&.host is not set\&. .RE .PP imap\&.host @@ -6377,7 +6375,7 @@ A boolean to enable/disable the use of html encoding when sending a patch\&. An .PP imap\&.authMethod .RS 4 -Specify authenticate method for authentication with IMAP server\&. If Git was built with the NO_CURL option, or if your curl version is older than 7\&.34\&.0, or if you\(cqre running git\-imap\-send with the +Specify the authentication method for authenticating with the IMAP server\&. If Git was built with the NO_CURL option, or if your curl version is older than 7\&.34\&.0, or if you\(cqre running git\-imap\-send with the \fB\-\-no\-curl\fR option, the only supported method is \fICRAM\-MD5\fR\&. If this is not set then @@ -6424,7 +6422,7 @@ index\&.threads .RS 4 Specifies the number of threads to spawn when loading the index\&. This is meant to reduce index load time on multiprocessor machines\&. Specifying 0 or \fItrue\fR -will cause Git to auto\-detect the number of CPU\(cqs and set the number of threads accordingly\&. Specifying 1 or +will cause Git to auto\-detect the number of CPUs and set the number of threads accordingly\&. Specifying 1 or \fIfalse\fR will disable multithreading\&. Defaults to \fItrue\fR\&. @@ -6533,7 +6531,7 @@ 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\&. +If the format is set to "auto:foo" and the pager is in use, format "foo" will be used for the date format\&. Otherwise, "default" will be used\&. .RE .PP log\&.decorate @@ -6644,7 +6642,7 @@ mailinfo\&.scissors 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 "\-")\&. +\fBgit-am\fR(1)) act by default as if the \-\-scissors option was provided on the command\-line\&. When active, this feature removes everything from the message body before a scissors line (i\&.e\&. consisting mainly of ">8", "8<" and "\-")\&. .RE .PP mailmap\&.file @@ -6694,7 +6692,7 @@ config value is set, then that value is used instead of the one provided by .sp -1 .IP \(bu 2.3 .\} -\fBnone\fR: This default setting implies no task are run at any schedule\&. +\fBnone\fR: This default setting implies no tasks are run at any schedule\&. .RE .sp .RS 4 @@ -6793,7 +6791,7 @@ format\&. See .PP man\&.<tool>\&.cmd .RS 4 -Specify the command to invoke the specified man viewer\&. The specified command is evaluated in shell with the man page passed as argument\&. (See +Specify the command to invoke the specified man viewer\&. The specified command is evaluated in shell with the man page passed as an argument\&. (See \fBgit-help\fR(1)\&.) .RE .PP @@ -6817,7 +6815,7 @@ marker\&. An alternate style, "diff3", adds a \fB|||||||\fR marker and the original text before the \fB=======\fR -marker\&. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides they are just pulled out of the conflict region\&. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region\&. +marker\&. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region\&. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region\&. .RE .PP merge\&.defaultToUpstream @@ -7155,7 +7153,7 @@ for the full description\&. .PP mergetool\&.<tool>\&.trustExitCode .RS 4 -For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful\&. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge\&. +For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful\&. If this is not set to true then the merge target file timestamp is checked, and the merge is assumed to have been successful if the file has been updated; otherwise, the user is prompted to indicate the success of the merge\&. .RE .PP mergetool\&.meld\&.hasOutput @@ -7187,7 +7185,7 @@ mergetool\&.meld\&.useAutoMerge .RS 4 When the \fB\-\-auto\-merge\fR -is given, meld will merge all non\-conflicting parts automatically, highlight the conflicting parts and wait for user decision\&. Setting +is given, meld will merge all non\-conflicting parts automatically, highlight the conflicting parts, and wait for user decision\&. Setting \fBmergetool\&.meld\&.useAutoMerge\fR to \fBtrue\fR @@ -7209,13 +7207,13 @@ altogether, and is the default value\&. .PP mergetool\&.vimdiff\&.layout .RS 4 -The vimdiff backend uses this variable to control how its split windows look like\&. Applies even if you are using Neovim (\fBnvim\fR) or gVim (\fBgvim\fR) as the merge tool\&. See BACKEND SPECIFIC HINTS section in +The vimdiff backend uses this variable to control how its split windows appear\&. Applies even if you are using Neovim (\fBnvim\fR) or gVim (\fBgvim\fR) as the merge tool\&. See BACKEND SPECIFIC HINTS section in \fBgit-mergetool\fR(1)\&. for details\&. .RE .PP mergetool\&.hideResolved .RS 4 -During a merge Git will automatically resolve as many conflicts as possible and write the +During a merge, Git will automatically resolve as many conflicts as possible and write the \fIMERGED\fR file containing conflict markers around any conflicts that it cannot resolve; \fILOCAL\fR @@ -7245,7 +7243,7 @@ then this file is not preserved\&. Defaults to mergetool\&.keepTemporaries .RS 4 When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool\&. If the tool returns an error and this variable is set to -\fBtrue\fR, then these temporary files will be preserved, otherwise they will be removed after the tool has exited\&. Defaults to +\fBtrue\fR, then these temporary files will be preserved; otherwise, they will be removed after the tool has exited\&. Defaults to \fBfalse\fR\&. .RE .PP @@ -7297,7 +7295,7 @@ 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 of +\fBmanual\fR\&. See the "NOTES MERGE STRATEGIES" section of \fBgit-notes\fR(1) for more information on each strategy\&. .sp @@ -7447,16 +7445,16 @@ pack\&.threads .RS 4 Specifies the number of threads to spawn when searching for best delta matches\&. This requires that \fBgit-pack-objects\fR(1) -be compiled with pthreads otherwise this option is ignored with a warning\&. This is meant to reduce packing time on multiprocessor machines\&. The required amount of memory for the delta search window is however multiplied by the number of threads\&. Specifying 0 will cause Git to auto\-detect the number of CPU\(cqs and set the number of threads accordingly\&. +be compiled with pthreads otherwise this option is ignored with a warning\&. This is meant to reduce packing time on multiprocessor machines\&. The required amount of memory for the delta search window is however multiplied by the number of threads\&. Specifying 0 will cause Git to auto\-detect the number of CPUs and set the number of threads accordingly\&. .RE .PP pack\&.indexVersion .RS 4 -Specify the default pack index version\&. Valid values are 1 for legacy pack index used by Git versions prior to 1\&.5\&.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted packs\&. Version 2 is the default\&. Note that version 2 is enforced and this config option ignored whenever the corresponding pack is larger than 2 GB\&. +Specify the default pack index version\&. Valid values are 1 for legacy pack index used by Git versions prior to 1\&.5\&.2, and 2 for the new pack index with capabilities for packs larger than 4 GB as well as proper protection against the repacking of corrupted packs\&. Version 2 is the default\&. Note that version 2 is enforced and this config option is ignored whenever the corresponding pack is larger than 2 GB\&. .sp If you have an old Git that does not understand the version 2 \fB*\&.idx\fR -file, cloning or fetching over a non native protocol (e\&.g\&. "http") that will copy both +file, cloning or fetching over a non\-native protocol (e\&.g\&. "http") that will copy both \fB*\&.pack\fR file and corresponding \fB*\&.idx\fR @@ -7476,7 +7474,7 @@ The maximum size of a pack\&. This setting only affects packing to a file when r option of \fBgit-repack\fR(1)\&. Reaching this limit results in the creation of multiple packfiles\&. .sp -Note that this option is rarely useful, and may result in a larger total on\-disk size (because Git will not store deltas between packs), as well as worse runtime performance (object lookup within multiple packs is slower than a single pack, and optimizations like reachability bitmaps cannot cope with multiple packs)\&. +Note that this option is rarely useful, and may result in a larger total on\-disk size (because Git will not store deltas between packs) and worse runtime performance (object lookup within multiple packs is slower than a single pack, and optimizations like reachability bitmaps cannot cope with multiple packs)\&. .sp If you need to actively run Git using smaller packfiles (e\&.g\&., because your filesystem does not support large files), this option may help\&. But if your goal is to transmit a packfile over a medium that supports limited sizes (e\&.g\&., removable media that cannot store the whole repository), you are likely better off creating a single large packfile and splitting it using a generic multi\-volume archive tool (e\&.g\&., Unix \fBsplit\fR)\&. @@ -7884,7 +7882,7 @@ is probably what you want\&. Possible values are: .IP \(bu 2.3 .\} \fBsimple\fR -\- pushes the current branch with the same name on the remote\&. +\- push 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\&. @@ -7923,7 +7921,7 @@ is the new default)\&. .PP push\&.followTags .RS 4 -If set to true enable +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\&. @@ -8172,14 +8170,14 @@ By setting this variable to a string, \fBgit receive\-pack\fR will accept a \fBgit push \-\-signed\fR -and verifies it by using a "nonce" protected by HMAC using this string as a secret key\&. +and verify it by using a "nonce" protected by HMAC using this string as a secret key\&. .RE .PP receive\&.certNonceSlop .RS 4 When a \fBgit push \-\-signed\fR -sent a push certificate with a "nonce" that was issued by a receive\-pack serving the same repository within this many seconds, export the "nonce" found in the certificate to +sends a push certificate with a "nonce" that was issued by a receive\-pack serving the same repository within this many seconds, export the "nonce" found in the certificate to \fBGIT_PUSH_CERT_NONCE\fR to the hooks (instead of what the receive\-pack asked the sending side to include)\&. This may allow writing checks in \fBpre\-receive\fR @@ -8534,7 +8532,7 @@ rerere\&.autoUpdate .RS 4 When set to true, \fBgit\-rerere\fR -updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolution\&. Defaults to false\&. +updates the index with the resulting contents after it cleanly resolves conflicts using previously recorded resolutions\&. Defaults to false\&. .RE .PP rerere\&.enabled @@ -8593,7 +8591,7 @@ to in your global config\&. This will protect you from attacks that involve cloning a repository that contains a bare repository and running a Git command within that directory\&. .sp This config setting is only respected in protected configuration (see -the section called \(lqSCOPES\(rq)\&. This prevents the untrusted repository from tampering with this value\&. +the section called \(lqSCOPES\(rq)\&. This prevents untrusted repositories from tampering with this value\&. .RE .RE .PP @@ -8610,7 +8608,7 @@ This is a multi\-valued setting, i\&.e\&. you can add more than one directory vi entry with an empty value\&. .sp This config setting is only respected in protected configuration (see -the section called \(lqSCOPES\(rq)\&. This prevents the untrusted repository from tampering with this value\&. +the section called \(lqSCOPES\(rq)\&. This prevents untrusted repositories from tampering with this value\&. .sp The value of this setting is interpolated, i\&.e\&. \fB~/<path>\fR @@ -8708,7 +8706,7 @@ Format of the file(s) specified in sendemail\&.aliasesFile\&. Must be one of \fImutt\fR, \fImailrc\fR, \fIpine\fR, -\fIelm\fR, or +\fIelm\fR, \fIgnus\fR, or \fIsendmail\fR\&. .sp @@ -8788,7 +8786,7 @@ option of .PP sendemail\&.smtpReloginDelay .RS 4 -Seconds wait before reconnecting to smtp server\&. See also the +Seconds to wait before reconnecting to the smtp server\&. See also the \fB\-\-relogin\-delay\fR option of \fBgit-send-email\fR(1)\&. @@ -8807,7 +8805,7 @@ Text editor used by \fBgit rebase \-i\fR for editing the rebase instruction file\&. The value is meant to be interpreted by the shell when it is used\&. It can be overridden by the \fBGIT_SEQUENCE_EDITOR\fR -environment variable\&. When not configured the default commit message editor is used instead\&. +environment variable\&. When not configured, the default commit message editor is used instead\&. .RE .PP showBranch\&.default @@ -8836,7 +8834,7 @@ is .PP splitIndex\&.maxPercentChange .RS 4 -When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written\&. The value should be between 0 and 100\&. If the value is 0 then a new shared index is always written, if it is 100 a new shared index is never written\&. By default the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries\&. See +When the split index feature is used, this specifies the percent of entries the split index can contain compared to the total number of entries in both the split index and the shared index before a new shared index is written\&. The value should be between 0 and 100\&. If the value is 0, then a new shared index is always written; if it is 100, a new shared index is never written\&. By default, the value is 20, so a new shared index is written if the number of entries in the split index would be greater than 20 percent of the total number of entries\&. See \fBgit-update-index\fR(1)\&. .RE .PP @@ -9002,7 +9000,7 @@ By default, \fBgit-status\fR(1) and \fBgit-commit\fR(1) -show files which are not currently tracked by Git\&. Directories which contain only untracked files, are shown with the directory name only\&. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some systems\&. So, this variable controls how the commands displays the untracked files\&. Possible values are: +show files which are not currently tracked by Git\&. Directories which contain only untracked files, are shown with the directory name only\&. Showing untracked files means that Git needs to lstat() all the files in the whole repository, which might be slow on some systems\&. So, this variable controls how the commands display the untracked files\&. Possible values are: .sp .RS 4 .ie n \{\ @@ -9049,7 +9047,7 @@ and .PP status\&.submoduleSummary .RS 4 -Defaults to false\&. If this is set to a non zero number or true (identical to \-1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see \-\-summary\-limit option of +Defaults to false\&. If this is set to a non\-zero number or true (identical to \-1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see \-\-summary\-limit option of \fBgit-submodule\fR(1))\&. Please note that the summary output command will be suppressed for all submodules when \fBdiff\&.ignoreSubmodules\fR is set to @@ -9064,7 +9062,7 @@ stash\&.showIncludeUntracked .RS 4 If this is set to true, the \fBgit stash show\fR -command will show the untracked files of a stash entry\&. Defaults to false\&. See description of +command will show the untracked files of a stash entry\&. Defaults to false\&. See the description of the \fIshow\fR command in \fBgit-stash\fR(1)\&. @@ -9074,7 +9072,7 @@ stash\&.showPatch .RS 4 If this is set to true, the \fBgit stash show\fR -command without an option will show the stash entry in patch form\&. Defaults to false\&. See description of +command without an option will show the stash entry in patch form\&. Defaults to false\&. See the description of the \fIshow\fR command in \fBgit-stash\fR(1)\&. @@ -9084,7 +9082,7 @@ stash\&.showStat .RS 4 If this is set to true, the \fBgit stash show\fR -command without an option will show diffstat of the stash entry\&. Defaults to true\&. See description of +command without an option will show a diffstat of the stash entry\&. Defaults to true\&. See the description of the \fIshow\fR command in \fBgit-stash\fR(1)\&. @@ -9094,7 +9092,7 @@ submodule\&.<name>\&.url .RS 4 The URL for a submodule\&. This variable is copied from the \&.gitmodules file to the git config via \fIgit submodule init\fR\&. The user can change the configured URL before obtaining the submodule via -\fIgit submodule update\fR\&. If neither submodule\&.<name>\&.active or submodule\&.active are set, the presence of this variable is used as a fallback to indicate whether the submodule is of interest to git commands\&. See +\fIgit submodule update\fR\&. If neither submodule\&.<name>\&.active nor submodule\&.active are set, the presence of this variable is used as a fallback to indicate whether the submodule is of interest to git commands\&. See \fBgit-submodule\fR(1) and \fBgitmodules\fR(5) @@ -9143,7 +9141,7 @@ file\&. .PP submodule\&.<name>\&.ignore .RS 4 -Defines under what circumstances "git status" and the diff family show a submodule as modified\&. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes to the submodules work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account\&. "untracked" will additionally let submodules with modified tracked files in their work tree show up\&. Using "none" (the default when this option is not set) also shows submodules that have untracked files in their work tree as changed\&. This setting overrides any setting made in \&.gitmodules for this submodule, both settings can be overridden on the command line by using the "\-\-ignore\-submodules" option\&. The +Defines under what circumstances "git status" and the diff family show a submodule as modified\&. When set to "all", it will never be considered modified (but it will nonetheless show up in the output of status and commit when it has been staged), "dirty" will ignore all changes to the submodule\(cqs work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account\&. "untracked" will additionally let submodules with modified tracked files in their work tree show up\&. Using "none" (the default when this option is not set) also shows submodules that have untracked files in their work tree as changed\&. This setting overrides any setting made in \&.gitmodules for this submodule, both settings can be overridden on the command line by using the "\-\-ignore\-submodules" option\&. The \fIgit submodule\fR commands are not affected by this setting\&. .RE @@ -9457,7 +9455,7 @@ environment variable\&. .PP trace2\&.maxFiles .RS 4 -Integer\&. When writing trace files to a target directory, do not write additional traces if we would exceed this many files\&. Instead, write a sentinel file that will block further tracing to this directory\&. Defaults to 0, which disables this check\&. +Integer\&. When writing trace files to a target directory, do not write additional traces if doing so would exceed this many files\&. Instead, write a sentinel file that will block further tracing to this directory\&. Defaults to 0, which disables this check\&. .RE .PP transfer\&.credentialsInUrl @@ -9471,7 +9469,7 @@ A configured URL can contain plaintext credentials in the form .sp Note that this is currently limited to detecting credentials in \fBremote\&.<name>\&.url\fR -configuration, it won\(cqt detect credentials in +configuration; it won\(cqt detect credentials in \fBremote\&.<name>\&.pushurl\fR configuration\&. .sp @@ -9509,7 +9507,7 @@ Even if it does, having such data stored "at rest" might expose you in other way .\} The git programs will pass the full URL to one another as arguments on the command\-line, meaning the credentials will be exposed to other users on OS\(cqs or systems that allow other users to see the full process list of other users\&. On linux the "hidepid" setting documented in procfs(5) allows for configuring this behavior\&. .sp -If such concerns don\(cqt apply to you then you probably don\(cqt need to be concerned about credentials exposure due to storing that sensitive data in git\(cqs configuration files\&. If you do want to use this, set +If such concerns don\(cqt apply to you then you probably don\(cqt need to be concerned about credentials exposure due to storing sensitive data in git\(cqs configuration files\&. If you do want to use this, set \fBtransfer\&.credentialsInUrl\fR to one of these values: .RE @@ -9835,22 +9833,20 @@ variables determine what ends up in the \fBauthor\fR and \fBcommitter\fR -field of commit objects\&. If you need the +fields of commit objects\&. If you need the \fBauthor\fR or \fBcommitter\fR to be different, the \fBauthor\&.name\fR, \fBauthor\&.email\fR, -\fBcommitter\&.name\fR -or +\fBcommitter\&.name\fR, or \fBcommitter\&.email\fR -variables can be set\&. Also, all of these can be overridden by the +variables can be set\&. All of these can be overridden by the \fBGIT_AUTHOR_NAME\fR, \fBGIT_AUTHOR_EMAIL\fR, \fBGIT_COMMITTER_NAME\fR, -\fBGIT_COMMITTER_EMAIL\fR -and +\fBGIT_COMMITTER_EMAIL\fR, and \fBEMAIL\fR environment variables\&. .sp @@ -9886,7 +9882,7 @@ is not selecting the key you want it to automatically when creating a signed tag \fBssh\fR this can contain the path to either your private ssh key or the public key when ssh\-agent is used\&. Alternatively it can contain a public key prefixed with \fBkey::\fR -directly (e\&.g\&.: "key::ssh\-rsa XXXXXX identifier")\&. The private key needs to be available via ssh\-agent\&. If not set git will call gpg\&.ssh\&.defaultKeyCommand (e\&.g\&.: "ssh\-add \-L") and try to use the first key available\&. For backward compatibility, a raw key which begins with "ssh\-", such as "ssh\-rsa XXXXXX identifier", is treated as "key::ssh\-rsa XXXXXX identifier", but this form is deprecated; use the +directly (e\&.g\&.: "key::ssh\-rsa XXXXXX identifier")\&. The private key needs to be available via ssh\-agent\&. If not set Git will call gpg\&.ssh\&.defaultKeyCommand (e\&.g\&.: "ssh\-add \-L") and try to use the first key available\&. For backward compatibility, a raw key which begins with "ssh\-", such as "ssh\-rsa XXXXXX identifier", is treated as "key::ssh\-rsa XXXXXX identifier", but this form is deprecated; use the \fBkey::\fR form instead\&. .RE @@ -9904,9 +9900,9 @@ versionsort\&.suffix Even when version sort is used in \fBgit-tag\fR(1), tagnames with the same base version but different suffixes are still sorted lexicographically, resulting e\&.g\&. in prerelease tags appearing after the main release (e\&.g\&. "1\&.0\-rc1" after "1\&.0")\&. This variable can be specified to determine the sorting order of tags with different suffixes\&. .sp -By specifying a single suffix in this variable, any tagname containing that suffix will appear before the corresponding main release\&. E\&.g\&. if the variable is set to "\-rc", then all "1\&.0\-rcX" tags will appear before "1\&.0"\&. If specified multiple times, once per suffix, then the order of suffixes in the configuration will determine the sorting order of tagnames with those suffixes\&. E\&.g\&. if "\-pre" appears before "\-rc" in the configuration, then all "1\&.0\-preX" tags will be listed before any "1\&.0\-rcX" tags\&. The placement of the main release tag relative to tags with various suffixes can be determined by specifying the empty suffix among those other suffixes\&. E\&.g\&. if the suffixes "\-rc", "", "\-ck" and "\-bfs" appear in the configuration in this order, then all "v4\&.8\-rcX" tags are listed first, followed by "v4\&.8", then "v4\&.8\-ckX" and finally "v4\&.8\-bfsX"\&. +By specifying a single suffix in this variable, any tagname containing that suffix will appear before the corresponding main release\&. E\&.g\&. if the variable is set to "\-rc", then all "1\&.0\-rcX" tags will appear before "1\&.0"\&. If specified multiple times, once per suffix, then the order of suffixes in the configuration will determine the sorting order of tagnames with those suffixes\&. E\&.g\&. if "\-pre" appears before "\-rc" in the configuration, then all "1\&.0\-preX" tags will be listed before any "1\&.0\-rcX" tags\&. The placement of the main release tag relative to tags with various suffixes can be determined by specifying the empty suffix among those other suffixes\&. E\&.g\&. if the suffixes "\-rc", "", "\-ck", and "\-bfs" appear in the configuration in this order, then all "v4\&.8\-rcX" tags are listed first, followed by "v4\&.8", then "v4\&.8\-ckX" and finally "v4\&.8\-bfsX"\&. .sp -If more than one suffixes match the same tagname, then that tagname will be sorted according to the suffix which starts at the earliest position in the tagname\&. If more than one different matching suffixes start at that earliest position, then that tagname will be sorted according to the longest of those suffixes\&. The sorting order between different suffixes is undefined if they are in multiple config files\&. +If more than one suffix matches the same tagname, then that tagname will be sorted according to the suffix which starts at the earliest position in the tagname\&. If more than one different matching suffix starts at that earliest position, then that tagname will be sorted according to the longest of those suffixes\&. The sorting order between different suffixes is undefined if they are in multiple config files\&. .RE .PP web\&.browser diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index e3eb941e2..a895aeea2 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,12 +37,12 @@ git-count-objects \- Count unpacked number of objects and their disk consumption .sp .SH "DESCRIPTION" .sp -This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack\&. +Counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack\&. .SH "OPTIONS" .PP \-v, \-\-verbose .RS 4 -Report in more detail: +Provide more detailed reports: .sp count: the number of loose objects .sp @@ -55,7 +55,7 @@ size\-pack: disk space consumed by the packs, in KiB (unless \-H is specified) prune\-packable: the number of loose objects that are also present in the packs\&. These objects could be pruned using \fBgit prune\-packed\fR\&. .sp -garbage: the number of files in object database that are neither valid loose objects nor valid packs +garbage: the number of files in the object database that are neither valid loose objects nor valid packs .sp size\-garbage: disk space consumed by garbage files, in KiB (unless \-H is specified) .sp diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index 7910ec739..411f74b54 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index 2f6e604a8..6dca4a96f 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git config credential\&.helper \*(Aqcache [<options>]\*(Aq .sp .SH "DESCRIPTION" .sp -This command caches credentials for use by future Git programs\&. The stored credentials are kept in memory of the cache\-daemon process (instead of written to a file) and are forgotten after a configurable timeout\&. Credentials are forgotten sooner if the cache\-daemon dies, for example if the system restarts\&. The cache is accessible over a Unix domain socket, restricted to the current user by filesystem permissions\&. +This command caches credentials for use by future Git programs\&. The stored credentials are kept in memory of the cache\-daemon process (instead of being written to a file) and are forgotten after a configurable timeout\&. Credentials are forgotten sooner if the cache\-daemon dies, for example if the system restarts\&. The cache is accessible over a Unix domain socket, restricted to the current user by filesystem permissions\&. .sp You probably don\(cqt want to invoke this command directly; it is meant to be used as a credential helper by other parts of Git\&. See \fBgitcredentials\fR(7) or \fBEXAMPLES\fR below\&. .SH "OPTIONS" diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index 35d4f67b5..f94599929 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -62,7 +62,7 @@ You probably don\(cqt want to invoke this command directly; it is meant to be us .RS 4 Use \fB<path>\fR -to lookup and store credentials\&. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected\&. If not specified, credentials will be searched for from +to lookup and store credentials\&. The file will have its filesystem permissions set to prevent other users on the system from reading it, but it will not be encrypted or otherwise protected\&. If not specified, credentials will be searched for from \fB~/\&.git\-credentials\fR and \fB$XDG_CONFIG_HOME/git/credentials\fR, and credentials will be written to diff --git a/man1/git-credential.1 b/man1/git-credential.1 index 845efcc3a..4f6c3394a 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -141,7 +141,7 @@ to reuse it in its next invocation\&. If the credential was rejected during the \fBgit credential\fR will ask for a new password in its next invocation\&. In either case, \fBgit credential\fR -should be fed with the credential description obtained from step (2) (which also contain the ones provided in step (1))\&. +should be fed with the credential description obtained from step (2) (which also contains the fields provided in step (1))\&. .RE .SH "INPUT/OUTPUT FORMAT" .sp diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index e30332d4e..72a839c86 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index f7faf5032..18b43eceb 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index bf58d5ca2..14e1ce31b 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index fe0bd893a..7f1bde122 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DAEMON" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -181,7 +181,7 @@ is specified, otherwise .PP \-\-user\-path, \-\-user\-path=<path> .RS 4 -Allow ~user notation to be used in requests\&. When specified with no parameter, requests to git://host/~alice/foo is taken as a request to access +Allow ~user notation to be used in requests\&. When specified with no parameter, a request to git://host/~alice/foo is taken as a request to access \fIfoo\fR repository in the home directory of user \fBalice\fR\&. If diff --git a/man1/git-describe.1 b/man1/git-describe.1 index 93aca9a2b..83808ac4e 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diagnose.1 b/man1/git-diagnose.1 index b5d1c2ebb..495e88d20 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DIAGNOSE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DIAGNOSE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index e392a3f0e..c5971ca9b 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -797,7 +797,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE @@ -951,21 +951,21 @@ For more detailed explanation on these common options, see also \fBgitdiffcore\f .PP \-1 \-\-base, \-2 \-\-ours, \-3 \-\-theirs, \-0 .RS 4 -Diff against the "base" version, "our branch" or "their branch" respectively\&. With these options, diffs for merged entries are not shown\&. +Diff against the "base" version, "our branch", or "their branch" respectively\&. With these options, diffs for merged entries are not shown\&. .sp The default is to diff against our branch (\-2) and the cleanly resolved paths\&. The option \-0 can be given to omit diff output for unmerged entries and just show "Unmerged"\&. .RE .PP \-c, \-\-cc .RS 4 -This compares stage 2 (our branch), stage 3 (their branch) and the working tree file and outputs a combined diff, similar to the way +This compares stage 2 (our branch), stage 3 (their branch), and the working tree file and outputs a combined diff, similar to the way \fIdiff\-tree\fR shows a merge commit with these flags\&. .RE .PP \-q .RS 4 -Remain silent even on nonexistent files +Remain silent even for nonexistent files .RE .SH "RAW OUTPUT FORMAT" .sp @@ -1400,7 +1400,7 @@ What the \-p option produces is slightly different from the traditional diff for .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header that looks like this: +It is preceded by a "git diff" header that looks like this: .sp .if n \{\ .RS 4 @@ -1426,11 +1426,11 @@ or \fBb/\fR filenames\&. .sp -When rename/copy is involved, +When a rename/copy is involved, \fBfile1\fR and \fBfile2\fR -show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&. +show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&. .RE .sp .RS 4 @@ -1530,11 +1530,11 @@ rename to a .\} Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in \fBgitattributes\fR(5) -for details of how to tailor to this to specific languages\&. +for details of how to tailor this to specific languages\&. .RE .SH "COMBINED DIFF FORMAT" .sp -Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&. +Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&. .sp A "combined diff" format looks like this: .sp @@ -1584,7 +1584,7 @@ index fabadb8,cc95eb0\&.\&.4866510 .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header, that looks like this (when the +It is preceded by a "git diff" header, that looks like this (when the \fB\-c\fR option is used): .sp @@ -1638,7 +1638,7 @@ deleted file mode <mode>,<mode> .sp The \fBmode <mode>,<mode>\&.\&.<mode>\fR -line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format\&. +line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&. .RE .sp .RS 4 @@ -1649,7 +1649,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex .sp -1 .IP " 3." 4.2 .\} -It is followed by two\-line from\-file/to\-file header +It is followed by a two\-line from\-file/to\-file header: .sp .if n \{\ .RS 4 @@ -1662,13 +1662,13 @@ It is followed by two\-line from\-file/to\-file header .RE .\} .sp -Similar to two\-line header for traditional +Similar to the two\-line header for the traditional \fIunified\fR diff format, \fB/dev/null\fR is used to signal created or deleted files\&. .sp -However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit +However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit: .sp .if n \{\ .RS 4 @@ -1718,7 +1718,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B .sp A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&. .sp -In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. +In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. .sp When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&. .SH "OTHER DIFF FORMATS" diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 551c04a97..6a854c437 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-diff-index \- Compare a tree to the working tree or index .sp .SH "DESCRIPTION" .sp -Compares the content and mode of the blobs found in a tree object with the corresponding tracked files in the working tree, or with the corresponding paths in the index\&. When <path> arguments are present, compares only paths matching those patterns\&. Otherwise all tracked files are compared\&. +Compare the content and mode of the blobs found in a tree object with the corresponding tracked files in the working tree, or with the corresponding paths in the index\&. When <path> arguments are present, compare only paths matching those patterns\&. Otherwise all tracked files are compared\&. .SH "OPTIONS" .PP \-p, \-u, \-\-patch @@ -797,7 +797,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE @@ -1403,7 +1403,7 @@ What the \-p option produces is slightly different from the traditional diff for .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header that looks like this: +It is preceded by a "git diff" header that looks like this: .sp .if n \{\ .RS 4 @@ -1429,11 +1429,11 @@ or \fBb/\fR filenames\&. .sp -When rename/copy is involved, +When a rename/copy is involved, \fBfile1\fR and \fBfile2\fR -show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&. +show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&. .RE .sp .RS 4 @@ -1533,11 +1533,11 @@ rename to a .\} Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in \fBgitattributes\fR(5) -for details of how to tailor to this to specific languages\&. +for details of how to tailor this to specific languages\&. .RE .SH "COMBINED DIFF FORMAT" .sp -Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&. +Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&. .sp A "combined diff" format looks like this: .sp @@ -1587,7 +1587,7 @@ index fabadb8,cc95eb0\&.\&.4866510 .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header, that looks like this (when the +It is preceded by a "git diff" header, that looks like this (when the \fB\-c\fR option is used): .sp @@ -1641,7 +1641,7 @@ deleted file mode <mode>,<mode> .sp The \fBmode <mode>,<mode>\&.\&.<mode>\fR -line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format\&. +line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&. .RE .sp .RS 4 @@ -1652,7 +1652,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex .sp -1 .IP " 3." 4.2 .\} -It is followed by two\-line from\-file/to\-file header +It is followed by a two\-line from\-file/to\-file header: .sp .if n \{\ .RS 4 @@ -1665,13 +1665,13 @@ It is followed by two\-line from\-file/to\-file header .RE .\} .sp -Similar to two\-line header for traditional +Similar to the two\-line header for the traditional \fIunified\fR diff format, \fB/dev/null\fR is used to signal created or deleted files\&. .sp -However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit +However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit: .sp .if n \{\ .RS 4 @@ -1721,7 +1721,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B .sp A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&. .sp -In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. +In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. .sp When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&. .SH "OTHER DIFF FORMATS" diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 7ffbb71f7..69e42ab53 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,7 +39,7 @@ git-diff-tree \- Compares the content and mode of blobs found via two tree objec .sp .SH "DESCRIPTION" .sp -Compares the content and mode of the blobs found via two tree objects\&. +Compare the content and mode of blobs found via two tree objects\&. .sp If there is only one <tree\-ish> given, the commit is compared with its parents (see \-\-stdin below)\&. .sp @@ -803,7 +803,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE @@ -967,12 +967,12 @@ If provided, the results are limited to a subset of files matching one of the pr .PP \-r .RS 4 -recurse into sub\-trees +Recurse into sub\-trees\&. .RE .PP \-t .RS 4 -show tree entry itself as well as subtrees\&. Implies \-r\&. +Show tree entry itself as well as subtrees\&. Implies \-r\&. .RE .PP \-\-root @@ -1014,7 +1014,7 @@ By default, \fIgit diff\-tree \-\-stdin\fR shows differences, either in machine\-readable form (without \fB\-p\fR) or in patch form (with -\fB\-p\fR)\&. This output can be suppressed\&. It is only useful with +\fB\-p\fR)\&. This output can be suppressed\&. It is only useful with the \fB\-v\fR flag\&. .RE @@ -1088,7 +1088,7 @@ and we are outputting in .PP \-\-expand\-tabs=<n>, \-\-expand\-tabs, \-\-no\-expand\-tabs .RS 4 -Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of +Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of \fI<n>\fR) in the log message before showing it in the output\&. \fB\-\-expand\-tabs\fR is a short\-hand for @@ -1133,7 +1133,7 @@ argument, use the ref to find the notes to display\&. The ref can specify the fu \fBrefs/\fR and otherwise \fBrefs/notes/\fR -is prefixed to form a full name of the ref\&. +is prefixed to form the full name of the ref\&. .sp Multiple \-\-notes options can be combined to control which notes are being displayed\&. Examples: "\-\-notes=foo" will show only notes from "refs/notes/foo"; "\-\-notes=foo \-\-notes" will show both notes from "refs/notes/foo" and from the default notes ref(s)\&. .RE @@ -1184,7 +1184,7 @@ option\&. It implies the \fB\-c\fR and \fB\-p\fR -options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification\&. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other "empty diff" case\&. +options and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&. When all hunks are uninteresting, the commit itself and the commit log message are not shown, just like in any other "empty diff" case\&. .RE .PP \-\-combined\-all\-paths @@ -2732,7 +2732,7 @@ What the \-p option produces is slightly different from the traditional diff for .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header that looks like this: +It is preceded by a "git diff" header that looks like this: .sp .if n \{\ .RS 4 @@ -2758,11 +2758,11 @@ or \fBb/\fR filenames\&. .sp -When rename/copy is involved, +When a rename/copy is involved, \fBfile1\fR and \fBfile2\fR -show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&. +show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&. .RE .sp .RS 4 @@ -2862,11 +2862,11 @@ rename to a .\} Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in \fBgitattributes\fR(5) -for details of how to tailor to this to specific languages\&. +for details of how to tailor this to specific languages\&. .RE .SH "COMBINED DIFF FORMAT" .sp -Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&. +Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&. .sp A "combined diff" format looks like this: .sp @@ -2916,7 +2916,7 @@ index fabadb8,cc95eb0\&.\&.4866510 .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header, that looks like this (when the +It is preceded by a "git diff" header, that looks like this (when the \fB\-c\fR option is used): .sp @@ -2970,7 +2970,7 @@ deleted file mode <mode>,<mode> .sp The \fBmode <mode>,<mode>\&.\&.<mode>\fR -line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format\&. +line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&. .RE .sp .RS 4 @@ -2981,7 +2981,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex .sp -1 .IP " 3." 4.2 .\} -It is followed by two\-line from\-file/to\-file header +It is followed by a two\-line from\-file/to\-file header: .sp .if n \{\ .RS 4 @@ -2994,13 +2994,13 @@ It is followed by two\-line from\-file/to\-file header .RE .\} .sp -Similar to two\-line header for traditional +Similar to the two\-line header for the traditional \fIunified\fR diff format, \fB/dev/null\fR is used to signal created or deleted files\&. .sp -However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit +However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit: .sp .if n \{\ .RS 4 @@ -3050,7 +3050,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B .sp A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&. .sp -In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. +In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. .sp When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&. .SH "OTHER DIFF FORMATS" diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 7f614cd8a..c5b06ecee 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DIFF" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -892,7 +892,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE @@ -1493,7 +1493,7 @@ What the \-p option produces is slightly different from the traditional diff for .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header that looks like this: +It is preceded by a "git diff" header that looks like this: .sp .if n \{\ .RS 4 @@ -1519,11 +1519,11 @@ or \fBb/\fR filenames\&. .sp -When rename/copy is involved, +When a rename/copy is involved, \fBfile1\fR and \fBfile2\fR -show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&. +show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&. .RE .sp .RS 4 @@ -1623,11 +1623,11 @@ rename to a .\} Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in \fBgitattributes\fR(5) -for details of how to tailor to this to specific languages\&. +for details of how to tailor this to specific languages\&. .RE .SH "COMBINED DIFF FORMAT" .sp -Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&. +Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&. .sp A "combined diff" format looks like this: .sp @@ -1677,7 +1677,7 @@ index fabadb8,cc95eb0\&.\&.4866510 .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header, that looks like this (when the +It is preceded by a "git diff" header, that looks like this (when the \fB\-c\fR option is used): .sp @@ -1731,7 +1731,7 @@ deleted file mode <mode>,<mode> .sp The \fBmode <mode>,<mode>\&.\&.<mode>\fR -line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format\&. +line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&. .RE .sp .RS 4 @@ -1742,7 +1742,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex .sp -1 .IP " 3." 4.2 .\} -It is followed by two\-line from\-file/to\-file header +It is followed by a two\-line from\-file/to\-file header: .sp .if n \{\ .RS 4 @@ -1755,13 +1755,13 @@ It is followed by two\-line from\-file/to\-file header .RE .\} .sp -Similar to two\-line header for traditional +Similar to the two\-line header for the traditional \fIunified\fR diff format, \fB/dev/null\fR is used to signal created or deleted files\&. .sp -However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit +However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit: .sp .if n \{\ .RS 4 @@ -1811,7 +1811,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B .sp A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&. .sp -In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. +In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. .sp When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&. .SH "OTHER DIFF FORMATS" @@ -2193,7 +2193,7 @@ 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 +to compare with work tree files, do not consider stat\-only changes 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 diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index ab36ed930..341fbfa94 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -57,7 +57,7 @@ Prompt before each invocation of the diff tool\&. This is the default behaviour; .PP \-\-rotate\-to=<file> .RS 4 -Start showing the diff for the given path, the paths before it will move to end and output\&. +Start showing the diff for the given path, the paths before it will move to the end and output\&. .RE .PP \-\-skip\-to=<file> @@ -119,7 +119,7 @@ Print a list of diff tools that may be used with .PP \-\-[no\-]symlinks .RS 4 -\fIgit difftool\fR\*(Aqs default behavior is create symlinks to the working tree when run in +\fIgit difftool\fR\*(Aqs default behavior is to create symlinks to the working tree when run in \fB\-\-dir\-diff\fR mode and the right\-hand side of the comparison yields the same content as the file in the working tree\&. .sp diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index 60277da0f..cfe444be8 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 79a343cc3..53f8e9c24 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -678,7 +678,7 @@ or .sp -1 .IP \(bu 2.3 .\} -\fB160000\fR: A gitlink, SHA\-1 of the object refers to a commit in another repository\&. Git links can only be specified by SHA or through a commit mark\&. They are used to implement submodules\&. +\fB160000\fR: A gitlink, SHA\-1 of the object refers to a commit in another repository\&. Git links can only be specified either by SHA or through a commit mark\&. They are used to implement submodules\&. .RE .sp .RS 4 @@ -1597,7 +1597,7 @@ The following tips and tricks have been collected from various users of fast\-im .sp When doing a repository conversion, use a unique mark per commit (\fBmark :<n>\fR) and supply the \-\-export\-marks option on the command line\&. fast\-import will dump a file which lists every mark and the Git object SHA\-1 that corresponds to it\&. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision\&. .sp -Coming from a system such as Perforce or Subversion this should be quite simple, as the fast\-import mark can also be the Perforce changeset number or the Subversion revision number\&. +Coming from a system such as Perforce or Subversion, this should be quite simple, as the fast\-import mark can also be the Perforce changeset number or the Subversion revision number\&. .SS "Freely Skip Around Branches" .sp Don\(cqt bother trying to optimize the frontend to stick to one branch at a time during an import\&. Although doing so might be slightly faster for fast\-import, it tends to increase the complexity of the frontend code considerably\&. @@ -1682,7 +1682,7 @@ 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 +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 diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index 2c899acc5..99341682a 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -90,7 +90,7 @@ If the remote side supports it, annotated tags objects will be downloaded on the .RS 4 Use this to specify the path to \fIgit\-upload\-pack\fR -on the remote side, if is not found on your $PATH\&. Installations of sshd ignores the user\(cqs environment setup scripts for login shells (e\&.g\&. \&.bash_profile) and your privately installed git may not be found on the system default $PATH\&. Another workaround suggested is to set up your $PATH in "\&.bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean \&.bashrc file (they set most of the things up in \&.bash_profile)\&. +on the remote side, if it is not found on your $PATH\&. Installations of sshd ignores the user\(cqs environment setup scripts for login shells (e\&.g\&. \&.bash_profile) and your privately installed git may not be found on the system default $PATH\&. Another workaround suggested is to set up your $PATH in "\&.bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean \&.bashrc file (they set most of the things up in \&.bash_profile)\&. .RE .PP \-\-exec=<git\-upload\-pack> diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index 037d909cf..6961ff9e0 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FETCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FETCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -107,7 +107,7 @@ If the source repository is shallow, fetch as much as possible so that the curre .RS 4 By default when fetching from a shallow repository, \fBgit fetch\fR -refuses refs that require updating \&.git/shallow\&. This option updates \&.git/shallow and accept such refs\&. +refuses refs that require updating \&.git/shallow\&. This option updates \&.git/shallow and accepts such refs\&. .RE .PP \-\-negotiation\-tip=<commit|glob> @@ -177,7 +177,7 @@ When \fIgit fetch\fR is used with \fB<src>:<dst>\fR -refspec it may refuse to update the local branch as discussed in the +refspec, it may refuse to update the local branch as discussed in the \fB<refspec>\fR part below\&. This option overrides that check\&. .RE @@ -478,7 +478,7 @@ Unlike when pushing with will be accepted without \fB+\fR in the refspec (or -\fB\-\-force\fR), whether that\(cqs swapping e\&.g\&. a tree object for a blob, or a commit for another commit that\(cqs doesn\(cqt have the previous commit as an ancestor etc\&. +\fB\-\-force\fR), whether that\(cqs swapping e\&.g\&. a tree object for a blob, or a commit for another commit that doesn\(cqt have the previous commit as an ancestor etc\&. .sp Unlike when pushing with \fBgit-push\fR(1), there is no configuration which\(cqll amend these rules, and nothing like a @@ -488,9 +488,9 @@ hook analogous to the hook\&. .sp As with pushing with -\fBgit-push\fR(1), all of the rules described above about what\(cqs not allowed as an update can be overridden by adding an the optional leading +\fBgit-push\fR(1), all of the rules described above about what\(cqs not allowed as an update can be overridden by adding an optional leading \fB+\fR -to a refspec (or using +to a refspec (or using the \fB\-\-force\fR command line option)\&. The only exception to this is that no amount of forcing will make the \fBrefs/heads/*\fR @@ -507,7 +507,7 @@ namespace accept a non\-commit object\&. \fBNote\fR .ps -1 .br -When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote\-tracking branch the last time you fetched)\&. You would want to use the +When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote\-tracking branch the last time you fetched)\&. You would want to use the \fB+\fR sign to indicate non\-fast\-forward updates will be needed for such branches\&. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch\&. .sp .5v @@ -522,7 +522,7 @@ Read refspecs, one per line, from stdin in addition to those provided as argumen .sp In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository\&. Depending on the transport protocol, some of this information may be absent\&. .sp -Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)\&. +Git supports ssh, git, http, and https protocols (in addition, ftp and ftps can be used for fetching, but this is inefficient and deprecated; do not use them)\&. .sp The native transport (i\&.e\&. git:// URL) does no authentication and should be used with caution on unsecured networks\&. .sp @@ -787,7 +787,7 @@ You can choose to provide the name of a remote which you had previously configur .\} .sp .sp -The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. +The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. .SS "Named file in \fB$GIT_DIR/remotes\fR" .sp You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The URL in this file will be used to access the repository\&. The refspec in this file will be used as default when you do not provide a refspec on the command line\&. This file should have the following format: @@ -796,7 +796,7 @@ You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The UR .RS 4 .\} .nf - URL: one of the above URL format + URL: one of the above URL formats Push: <refspec> Pull: <refspec> .fi @@ -1306,9 +1306,9 @@ Control how ref update status is printed\&. Valid values are \fBfull\fR and \fBcompact\fR\&. Default value is -\fBfull\fR\&. See section OUTPUT in +\fBfull\fR\&. See the OUTPUT section in \fBgit-fetch\fR(1) -for detail\&. +for details\&. .RE .PP fetch\&.negotiationAlgorithm diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index 61541cb28..3ee9ba9da 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index ba10c4932..e92a03a35 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index 76f5cf983..4744fcf0d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 396410454..d623ff832 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index eac67fca8..7a5b2986d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -101,7 +101,7 @@ The "patch", which is the "diff \-p \-\-stat" output (see \fBgit-diff\fR(1)) between the commit and its parent\&. .RE .sp -The log message and the patch is separated by a line with a three\-dash line\&. +The log message and the patch are separated by a line with a three\-dash line\&. .sp There are two ways to specify which commits to operate on\&. .sp @@ -509,7 +509,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index 9511668b5..cda2cc0b7 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index 8d64c557f..dabd1b039 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FSCK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FSCK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,7 +49,7 @@ An object to treat as the head of an unreachability trace\&. .sp If no objects are given, \fIgit fsck\fR -defaults to using the index file, all SHA\-1 references in +defaults to using the index file, all SHA\-1 references in the \fBrefs\fR namespace, and all reflogs (unless \-\-no\-reflogs is given) as heads\&. .RE @@ -95,7 +95,7 @@ Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the .PP \-\-connectivity\-only .RS 4 -Check only the connectivity of reachable objects, making sure that any objects referenced by a reachable tag, commit, or tree is present\&. This speeds up the operation by avoiding reading blobs entirely (though it does still check that referenced blobs exist)\&. This will detect corruption in commits and trees, but not do any semantic checks (e\&.g\&., for format errors)\&. Corruption in blob objects will not be detected at all\&. +Check only the connectivity of reachable objects, making sure that any objects referenced by a reachable tag, commit, or tree are present\&. This speeds up the operation by avoiding reading blobs entirely (though it does still check that referenced blobs exist)\&. This will detect corruption in commits and trees, but not do any semantic checks (e\&.g\&., for format errors)\&. Corruption in blob objects will not be detected at all\&. .sp Unreachable tags, commits, and trees will also be accessed to find the tips of dangling segments of history\&. Use \fB\-\-no\-dangling\fR @@ -104,7 +104,7 @@ if you don\(cqt care about this output and want to speed it up further\&. .PP \-\-strict .RS 4 -Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of Git\&. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag\&. +Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of Git\&. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old objects that trigger this check, but it is recommended to check new projects with this flag\&. .RE .PP \-\-verbose @@ -153,19 +153,18 @@ The rest of the documentation discusses for brevity, but the same applies for the corresponding \fBreceive\&.fsck\&.*\fR and -\fBfetch\&.<msg\-id>\&.*\fR\&. variables\&. +\fBfetch\&.fsck\&.*\fR\&. variables\&. .sp Unlike variables like \fBcolor\&.ui\fR and -\fBcore\&.editor\fR -the +\fBcore\&.editor\fR, the \fBreceive\&.fsck\&.<msg\-id>\fR and \fBfetch\&.fsck\&.<msg\-id>\fR variables will not fall back on the \fBfsck\&.<msg\-id>\fR -configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances all three of them they must all set to the same values\&. +configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances, all three of them must be set to the same values\&. .sp When \fBfsck\&.<msg\-id>\fR @@ -192,7 +191,7 @@ and \fBfetch\&.fsck\&.<msg\-id>\fR will only cause git to warn\&. .sp -See +See the \fBFsck Messages\fR section of \fBgit-fsck\fR(1) @@ -202,9 +201,9 @@ for supported values of .PP fsck\&.skipList .RS 4 -The path to a list of object names (i\&.e\&. one unabbreviated SHA\-1 per line) that are known to be broken in a non\-fatal way and should be ignored\&. On versions of Git 2\&.20 and later comments (\fI#\fR), empty lines, and any leading and trailing whitespace is ignored\&. Everything but a SHA\-1 per line will error out on older versions\&. +The path to a list of object names (i\&.e\&. one unabbreviated SHA\-1 per line) that are known to be broken in a non\-fatal way and should be ignored\&. On versions of Git 2\&.20 and later, comments (\fI#\fR), empty lines, and any leading and trailing whitespace are ignored\&. Everything but a SHA\-1 per line will error out on older versions\&. .sp -This feature is useful when an established project should be accepted despite early commits containing errors that can be safely ignored such as invalid committer email addresses\&. Note: corrupt objects cannot be skipped with this setting\&. +This feature is useful when an established project should be accepted despite early commits containing errors that can be safely ignored, such as invalid committer email addresses\&. Note: corrupt objects cannot be skipped with this setting\&. .sp Like \fBfsck\&.<msg\-id>\fR @@ -224,9 +223,9 @@ and \fBfetch\&.fsck\&.skipList\fR variables will not fall back on the \fBfsck\&.skipList\fR -configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances all three of them they must all set to the same values\&. +configuration if they aren\(cqt set\&. To uniformly configure the same fsck settings in different circumstances, all three of them must be set to the same values\&. .sp -Older versions of Git (before 2\&.20) documented that the object names list should be sorted\&. This was never a requirement, the object names could appear in any order, but when reading the list we tracked whether the list was sorted for the purposes of an internal binary search implementation, which could save itself some work with an already sorted list\&. Unless you had a humongous list there was no reason to go out of your way to pre\-sort the list\&. After Git version 2\&.20 a hash implementation is used instead, so there\(cqs now no reason to pre\-sort the list\&. +Older versions of Git (before 2\&.20) documented that the object names list should be sorted\&. This was never a requirement; the object names could appear in any order, but when reading the list we tracked whether the list was sorted for the purposes of an internal binary search implementation, which could save itself some work with an already sorted list\&. Unless you had a humongous list there was no reason to go out of your way to pre\-sort the list\&. After Git version 2\&.20 a hash implementation is used instead, so there\(cqs now no reason to pre\-sort the list\&. .RE .SH "DISCUSSION" .sp @@ -508,7 +507,7 @@ line in tag object\&. .PP \fBmissingSpaceBeforeEmail\fR .RS 4 -(ERROR) Missing space before the email in author/committer line\&. +(ERROR) Missing space before the email in an author/committer line\&. .RE .PP \fBmissingTag\fR @@ -590,7 +589,7 @@ line in a tag object\&. .PP \fBzeroPaddedDate\fR .RS 4 -(ERROR) Found a zero padded date in an author/commiter line\&. +(ERROR) Found a zero padded date in an author/committer line\&. .RE .PP \fBzeroPaddedFilemode\fR diff --git a/man1/git-fsmonitor--daemon.1 b/man1/git-fsmonitor--daemon.1 index 91062ebcb..e1e357f5f 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -77,11 +77,11 @@ For more information see the "File System Monitor" section in \fBgit-update-inde .sp The fsmonitor daemon does not currently know about submodules and does not know to filter out filesystem events that happen within a submodule\&. If fsmonitor daemon is watching a super repo and a file is modified within the working directory of a submodule, it will report the change (as happening against the super repo)\&. However, the client will properly ignore these extra events, so performance may be affected but it will not cause an incorrect result\&. .sp -By default, the fsmonitor daemon refuses to work against network\-mounted repositories; this may be overridden by setting \fBfsmonitor\&.allowRemote\fR to \fBtrue\fR\&. Note, however, that the fsmonitor daemon is not guaranteed to work correctly with all network\-mounted repositories and such use is considered experimental\&. +By default, the fsmonitor daemon refuses to work with network\-mounted repositories; this may be overridden by setting \fBfsmonitor\&.allowRemote\fR to \fBtrue\fR\&. Note, however, that the fsmonitor daemon is not guaranteed to work correctly with all network\-mounted repositories, so such use is considered experimental\&. .sp On Mac OS, the inter\-process communication (IPC) between various Git commands and the fsmonitor daemon is done via a Unix domain socket (UDS) \(em a special type of file \(em which is supported by native Mac OS filesystems, but not on network\-mounted filesystems, NTFS, or FAT32\&. Other filesystems may or may not have the needed support; the fsmonitor daemon is not guaranteed to work with these filesystems and such use is considered experimental\&. .sp -By default, the socket is created in the \fB\&.git\fR directory, however, if the \fB\&.git\fR directory is on a network\-mounted filesystem, it will be instead be created at \fB$HOME/\&.git\-fsmonitor\-*\fR unless \fB$HOME\fR itself is on a network\-mounted filesystem in which case you must set the configuration variable \fBfsmonitor\&.socketDir\fR to the path of a directory on a Mac OS native filesystem in which to create the socket file\&. +By default, the socket is created in the \fB\&.git\fR directory\&. However, if the \fB\&.git\fR directory is on a network\-mounted filesystem, it will instead be created at \fB$HOME/\&.git\-fsmonitor\-*\fR unless \fB$HOME\fR itself is on a network\-mounted filesystem, in which case you must set the configuration variable \fBfsmonitor\&.socketDir\fR to the path of a directory on a Mac OS native filesystem in which to create the socket file\&. .sp If none of the above directories (\fB\&.git\fR, \fB$HOME\fR, or \fBfsmonitor\&.socketDir\fR) is on a native Mac OS file filesystem the fsmonitor daemon will report an error that will cause the daemon and the currently running command to exit\&. .SH "CONFIGURATION" @@ -90,7 +90,7 @@ Everything below this line in this section is selectively included from the \fBg .PP fsmonitor\&.allowRemote .RS 4 -By default, the fsmonitor daemon refuses to work against network\-mounted repositories\&. Setting +By default, the fsmonitor daemon refuses to work with network\-mounted repositories\&. Setting \fBfsmonitor\&.allowRemote\fR to \fBtrue\fR diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 5c703aaf1..3d8421bf8 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-GC" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-GC" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -171,7 +171,7 @@ When there are approximately more than this many loose objects in the repository \fBgit gc \-\-auto\fR will pack them\&. Some Porcelain commands use this command to perform a light\-weight garbage collection from time to time\&. The default value is 6700\&. .sp -Setting this to 0 disables not only automatic packing based on the number of loose objects, but any other heuristic +Setting this to 0 disables not only automatic packing based on the number of loose objects, but also any other heuristic \fBgit gc \-\-auto\fR will otherwise use to determine if there\(cqs work to do, such as \fBgc\&.autoPackLimit\fR\&. @@ -196,7 +196,7 @@ gc\&.autoDetach .RS 4 Make \fBgit gc \-\-auto\fR -return immediately and run in background if the system supports it\&. Default is true\&. +return immediately and run in the background if the system supports it\&. Default is true\&. .RE .PP gc\&.bigPackThreshold diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1 index 9e0170845..0d875ab3d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,7 +39,7 @@ git-get-tar-commit-id \- Extract commit ID from an archive created using git\-ar .sp Read a tar archive created by \fIgit archive\fR from the standard input and extract the commit ID stored in it\&. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of the tar archive very much\&. .sp -If no commit ID is found, \fIgit get\-tar\-commit\-id\fR quietly exists with a return code of 1\&. This can happen if the archive had not been created using \fIgit archive\fR or if the first parameter of \fIgit archive\fR had been a tree ID instead of a commit ID or tag\&. +If no commit ID is found, \fIgit get\-tar\-commit\-id\fR quietly exits with a return code of 1\&. This can happen if the archive had not been created using \fIgit archive\fR or if the first parameter of \fIgit archive\fR had been a tree ID instead of a commit ID or tag\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-grep.1 b/man1/git-grep.1 index f424973e5..b90ecf515 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-GREP" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-GREP" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -415,7 +415,7 @@ Looks for .sp The \fB\-\-threads\fR option (and the grep\&.threads configuration) will be ignored when \fB\-\-open\-files\-in\-pager\fR is used, forcing a single\-threaded execution\&. .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\&. +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 are 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: diff --git a/man1/git-gui.1 b/man1/git-gui.1 index f6b98963d..eb8c58292 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-GUI" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-GUI" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index 02321cbdb..168dad131 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -68,7 +68,7 @@ Read file names from the standard input, one per line, instead of from the comma .PP \-\-path .RS 4 -Hash object as it were located at the given path\&. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file\&. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin\&. +Hash object as if it were located at the given path\&. The location of the file does not directly influence the hash value, but the path is used to determine which Git filters should be applied to the object before it can be placed in the object database\&. As a result of applying filters, the actual blob put into the object database may differ from the given file\&. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin\&. .RE .PP \-\-no\-filters diff --git a/man1/git-help.1 b/man1/git-help.1 index 516e8f82f..7610a815f 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-HELP" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-HELP" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -56,12 +56,12 @@ Note that \fBgit \-\-help \&.\&.\&.\fR is identical to \fBgit help \&.\&.\&.\fR .sp To display the \fBgit\fR(1) man page, use \fBgit help git\fR\&. .sp -This page can be displayed with \fIgit help help\fR or \fBgit help \-\-help\fR +This page can be displayed with \fIgit help help\fR or \fBgit help \-\-help\fR\&. .SH "OPTIONS" .PP \-a, \-\-all .RS 4 -Prints all the available commands on the standard output\&. +Print all the available commands on the standard output\&. .RE .PP \-\-no\-external\-commands @@ -80,8 +80,7 @@ When used with \-\-verbose .RS 4 When used with -\fB\-\-all\fR -print description for all recognized commands\&. This is the default\&. +\fB\-\-all\fR, print description for all recognized commands\&. This is the default\&. .RE .PP \-c, \-\-config @@ -92,12 +91,12 @@ List all available configuration variables\&. This is a short summary of the lis .PP \-g, \-\-guides .RS 4 -Prints a list of the Git concept guides on the standard output\&. +Print a list of the Git concept guides on the standard output\&. .RE .PP \-\-user\-interfaces .RS 4 -Prints a list of the repository, command and file interfaces documentation on the standard output\&. +Print a list of the repository, command and file interfaces documentation on the standard output\&. .sp In\-repository file interfaces such as \fB\&.git/info/exclude\fR @@ -116,7 +115,7 @@ interface described in .PP \-\-developer\-interfaces .RS 4 -Print list of file formats, protocols and other developer interfaces documentation on the standard output\&. +Print a list of file formats, protocols and other developer interfaces documentation on the standard output\&. .RE .PP \-i, \-\-info @@ -152,7 +151,7 @@ Display manual page for the command in the The web browser can be specified using the configuration variable \fBhelp\&.browser\fR, or \fBweb\&.browser\fR -if the former is not set\&. If none of these config variables is set, the +if the former is not set\&. If neither of these config variables is set, the \fIgit web\-\-browse\fR helper script (called by \fIgit help\fR) will pick a suitable default\&. See @@ -199,7 +198,7 @@ If no command\-line option is passed, the \fBhelp\&.format\fR configuration vari "web" or "html" correspond to \fI\-w|\-\-web\fR\&. .RE -.SS "help\&.browser, web\&.browser and browser\&.<tool>\&.path" +.SS "help\&.browser, web\&.browser, and browser\&.<tool>\&.path" .sp The \fBhelp\&.browser\fR, \fBweb\&.browser\fR and \fBbrowser\&.<tool>\&.path\fR will also be checked if the \fIweb\fR format is chosen (either by command\-line option or configuration variable)\&. See \fI\-w|\-\-web\fR in the OPTIONS section above and \fBgit-web--browse\fR(1)\&. .SS "man\&.viewer" diff --git a/man1/git-hook.1 b/man1/git-hook.1 index 075409de5..3b8f7a910 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-HOOK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-HOOK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-hook \- Run git hooks .sp .SH "DESCRIPTION" .sp -A command interface to running git hooks (see \fBgithooks\fR(5)), for use by other scripted git commands\&. +A command interface for running git hooks (see \fBgithooks\fR(5)), for use by other scripted git commands\&. .SH "SUBCOMMANDS" .PP run @@ -60,7 +60,7 @@ for arguments hooks might expect (if any)\&. .PP \-\-to\-stdin .RS 4 -For "run"; Specify a file which will be streamed into the hook\(cqs stdin\&. The hook will receive the entire file from beginning to EOF\&. +For "run"; specify a file which will be streamed into the hook\(cqs stdin\&. The hook will receive the entire file from beginning to EOF\&. .RE .PP \-\-ignore\-missing diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index 99a94caaa..0c9dfd0f3 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,7 +39,7 @@ git-http-backend \- Server side implementation of Git over HTTP .sp A simple CGI program to serve the contents of a Git repository to Git clients accessing the repository over http:// and https:// protocols\&. The program supports clients fetching using both the smart HTTP protocol and the backwards\-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol\&. It also supports Git\(cqs more\-efficient "v2" protocol if properly configured; see the discussion of \fBGIT_PROTOCOL\fR in the ENVIRONMENT section below\&. .sp -It verifies that the directory has the magic file "git\-daemon\-export\-ok", and it will refuse to export any Git directory that hasn\(cqt explicitly been marked for export this way (unless the \fBGIT_HTTP_EXPORT_ALL\fR environmental variable is set)\&. +It verifies that the directory has the magic file "git\-daemon\-export\-ok", and it will refuse to export any Git directory that hasn\(cqt explicitly been marked for export this way (unless the \fBGIT_HTTP_EXPORT_ALL\fR environment variable is set)\&. .sp By default, only the \fBupload\-pack\fR service is enabled, which serves \fIgit fetch\-pack\fR and \fIgit ls\-remote\fR clients, which are invoked from \fIgit fetch\fR, \fIgit pull\fR, and \fIgit clone\fR\&. If the client is authenticated, the \fBreceive\-pack\fR service is enabled, which serves \fIgit send\-pack\fR clients, which is invoked from \fIgit push\fR\&. .SH "SERVICES" @@ -48,7 +48,7 @@ These services can be enabled/disabled using the per\-repository configuration f .PP http\&.getanyfile .RS 4 -This serves Git clients older than version 1\&.6\&.6 that are unable to use the upload pack service\&. When enabled, clients are able to read any file within the repository, including objects that are no longer reachable from a branch but are still present\&. It is enabled by default, but a repository can disable it by setting this configuration item to +This serves Git clients older than version 1\&.6\&.6 that are unable to use the upload pack service\&. When enabled, clients are able to read any file within the repository, including objects that are no longer reachable from a branch but are still present\&. It is enabled by default, but a repository can disable it by setting this configuration value to \fBfalse\fR\&. .RE .PP @@ -58,7 +58,7 @@ This serves \fIgit fetch\-pack\fR and \fIgit ls\-remote\fR -clients\&. It is enabled by default, but a repository can disable it by setting this configuration item to +clients\&. It is enabled by default, but a repository can disable it by setting this configuration value to \fBfalse\fR\&. .RE .PP @@ -409,9 +409,9 @@ QUERY_STRING REQUEST_METHOD .RE .sp -The \fBGIT_HTTP_EXPORT_ALL\fR environmental variable may be passed to \fIgit\-http\-backend\fR to bypass the check for the "git\-daemon\-export\-ok" file in each repository before allowing export of that repository\&. +The \fBGIT_HTTP_EXPORT_ALL\fR environment variable may be passed to \fIgit\-http\-backend\fR to bypass the check for the "git\-daemon\-export\-ok" file in each repository before allowing export of that repository\&. .sp -The \fBGIT_HTTP_MAX_REQUEST_BUFFER\fR environment variable (or the \fBhttp\&.maxRequestBuffer\fR config variable) may be set to change the largest ref negotiation request that git will handle during a fetch; any fetch requiring a larger buffer will not succeed\&. This value should not normally need to be changed, but may be helpful if you are fetching from a repository with an extremely large number of refs\&. The value can be specified with a unit (e\&.g\&., \fB100M\fR for 100 megabytes)\&. The default is 10 megabytes\&. +The \fBGIT_HTTP_MAX_REQUEST_BUFFER\fR environment variable (or the \fBhttp\&.maxRequestBuffer\fR config option) may be set to change the largest ref negotiation request that git will handle during a fetch; any fetch requiring a larger buffer will not succeed\&. This value should not normally need to be changed, but may be helpful if you are fetching from a repository with an extremely large number of refs\&. The value can be specified with a unit (e\&.g\&., \fB100M\fR for 100 megabytes)\&. The default is 10 megabytes\&. .sp Clients may probe for optional protocol capabilities (like the v2 protocol) using the \fBGit\-Protocol\fR HTTP header\&. In order to support these, the contents of that header must appear in the \fBGIT_PROTOCOL\fR environment variable\&. Most webservers will pass this header to the CGI via the \fBHTTP_GIT_PROTOCOL\fR variable, and \fBgit\-http\-backend\fR will automatically copy that to \fBGIT_PROTOCOL\fR\&. However, some webservers may be more selective about which headers they\(cqll pass, in which case they need to be configured explicitly (see the mention of \fBGit\-Protocol\fR in the Apache config from the earlier EXAMPLES section)\&. .sp diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index 5745d72a0..d0130dc64 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -59,7 +59,7 @@ Report what is downloaded\&. .PP \-w <filename> .RS 4 -Writes the commit\-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete\&. +Writes the commit\-id into the specified filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete\&. .RE .PP \-\-stdin diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index 13f254550..3a2e2a52e 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,9 +37,9 @@ git-http-push \- Push objects over HTTP/DAV to another repository .sp .SH "DESCRIPTION" .sp -Sends missing objects to remote repository, and updates the remote branch\&. +Sends missing objects to the remote repository, and updates the remote branch\&. .sp -\fBNOTE\fR: This command is temporarily disabled if your libcurl is older than 7\&.16, as the combination has been reported not to work and sometimes corrupts repository\&. +\fBNOTE\fR: This command is temporarily disabled if your libcurl is older than 7\&.16, as the combination has been reported not to work and sometimes corrupts the repository\&. .SH "OPTIONS" .PP \-\-all @@ -64,7 +64,7 @@ Report the list of objects being walked locally and the list of objects successf .PP \-d, \-D .RS 4 -Remove <ref> from remote repository\&. The specified branch cannot be the remote HEAD\&. If \-d is specified the following other conditions must also be met: +Remove <ref> from remote repository\&. The specified branch cannot be the remote HEAD\&. If \-d is specified, the following other conditions must also be met: .sp .RS 4 .ie n \{\ @@ -158,7 +158,7 @@ it has to start with "refs/"; <dst> is used as the destination literally in this .RE .RE .sp -Without \(oq\-\-force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i\&.e\&. an ancestor) of <src>\&. This check, known as "fast\-forward check", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples\(cq commits from there\&. +Without \(oq\-\-force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i\&.e\&. an ancestor) of <src>\&. This check, known as "fast\-forward check", is performed to avoid accidentally overwriting the remote ref and losing other peoples\(cq commits from there\&. .sp With \fB\-\-force\fR, the fast\-forward check is disabled for all refs\&. .sp diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index 1c8d5d0ae..9bc231d25 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -76,7 +76,7 @@ The folder to drop the mails into, which is typically the Drafts folder\&. For e .PP imap\&.tunnel .RS 4 -Command used to setup a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server\&. Required when imap\&.host is not set\&. +Command used to set up a tunnel to the IMAP server through which commands will be piped instead of using a direct network connection to the server\&. Required when imap\&.host is not set\&. .RE .PP imap\&.host @@ -117,7 +117,7 @@ A boolean to enable/disable the use of html encoding when sending a patch\&. An .PP imap\&.authMethod .RS 4 -Specify authenticate method for authentication with IMAP server\&. If Git was built with the NO_CURL option, or if your curl version is older than 7\&.34\&.0, or if you\(cqre running git\-imap\-send with the +Specify the authentication method for authenticating with the IMAP server\&. If Git was built with the NO_CURL option, or if your curl version is older than 7\&.34\&.0, or if you\(cqre running git\-imap\-send with the \fB\-\-no\-curl\fR option, the only supported method is \fICRAM\-MD5\fR\&. If this is not set then diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index e263e9fdc..455471c6b 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,7 +39,7 @@ git-index-pack \- Build pack index file for an existing packed archive .sp .SH "DESCRIPTION" .sp -Reads a packed archive (\&.pack) from the specified file, and builds a pack index file (\&.idx) for it\&. Optionally writes a reverse\-index (\&.rev) for the specified pack\&. The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository\&. +Reads a packed archive (\&.pack) from the specified file, builds a pack index file (\&.idx) for it, and optionally writes a reverse\-index (\&.rev) for the specified pack\&. The packed archive, together with the pack index, can then be placed in the objects/pack/ directory of a Git repository\&. .SH "OPTIONS" .PP \-v @@ -86,7 +86,7 @@ process from deleting the newly constructed pack and index before refs can be up .PP \-\-keep=<msg> .RS 4 -Like \-\-keep create a \&.keep file before moving the index into its final destination, but rather than creating an empty file place +Like \-\-keep, create a \&.keep file before moving the index into its final destination\&. However, instead of creating an empty file place \fI<msg>\fR followed by an LF into the \&.keep file\&. The \fI<msg>\fR diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index 3a2afef56..994decdd8 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index 1dd8d7f0a..7d959d74d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-INIT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-INIT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -44,7 +44,7 @@ This command creates an empty Git repository \- basically a \fB\&.git\fR directo .sp If the \fB$GIT_DIR\fR environment variable is set then it specifies a path to use instead of \fB\&./\&.git\fR for the base of the repository\&. .sp -If the object storage directory is specified via the \fB$GIT_OBJECT_DIRECTORY\fR environment variable then the sha1 directories are created underneath \- otherwise the default \fB$GIT_DIR/objects\fR directory is used\&. +If the object storage directory is specified via the \fB$GIT_OBJECT_DIRECTORY\fR environment variable then the sha1 directories are created underneath; otherwise, the default \fB$GIT_DIR/objects\fR directory is used\&. .sp Running \fIgit init\fR in an existing repository is safe\&. It will not overwrite things that are already there\&. The primary reason for rerunning \fIgit init\fR is to pick up newly added templates (or to move the repository to another place if \-\-separate\-git\-dir is given)\&. .SH "OPTIONS" @@ -85,9 +85,9 @@ Specify the directory from which templates will be used\&. (See the "TEMPLATE DI Instead of initializing the repository as a directory to either \fB$GIT_DIR\fR or -\fB\&./\&.git/\fR, create a text file there containing the path to the actual repository\&. This file acts as filesystem\-agnostic Git symbolic link to the repository\&. +\fB\&./\&.git/\fR, create a text file there containing the path to the actual repository\&. This file acts as a filesystem\-agnostic Git symbolic link to the repository\&. .sp -If this is reinitialization, the repository will be moved to the specified path\&. +If this is a reinitialization, the repository will be moved to the specified path\&. .RE .PP \-b <branch\-name>, \-\-initial\-branch=<branch\-name> @@ -117,7 +117,7 @@ is not specified\&. .PP \fIgroup\fR (or \fItrue\fR) .RS 4 -Make the repository group\-writable, (and g+sx, since the git group may be not the primary group of all users)\&. This is used to loosen the permissions of an otherwise safe umask(2) value\&. Note that the umask still applies to the other permission bits (e\&.g\&. if umask is +Make the repository group\-writable, (and g+sx, since the git group may not be the primary group of all users)\&. This is used to loosen the permissions of an otherwise safe umask(2) value\&. Note that the umask still applies to the other permission bits (e\&.g\&. if umask is \fI0022\fR, using \fIgroup\fR will not remove read privileges from other (non\-group) users)\&. See @@ -141,7 +141,7 @@ will override users\(cq umask(2) value (and not only loosen permissions as \fIgroup\fR and \fIall\fR -does)\&. +do)\&. \fI0640\fR will create a repository which is group\-readable, but not group\-writable or accessible to others\&. \fI0660\fR diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index f82b2a67b..1fcc852a7 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index 7f607ca23..42a009d19 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-log.1 b/man1/git-log.1 index 5e3d73426..03cb2577f 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-LOG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-LOG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -357,7 +357,7 @@ is in use\&. .PP \-\-grep=<pattern> .RS 4 -Limit the commits output to ones with log message that matches the specified pattern (regular expression)\&. With more than one +Limit the commits output to ones with a log message that matches the specified pattern (regular expression)\&. With more than one \fB\-\-grep=<pattern>\fR, commits whose message matches any of the given patterns are chosen (but see \fB\-\-all\-match\fR)\&. .sp @@ -374,7 +374,7 @@ Limit the commits output to ones that match all given .PP \-\-invert\-grep .RS 4 -Limit the commits output to ones with log message that do not match the pattern specified with +Limit the commits output to ones with a log message that do not match the pattern specified with \fB\-\-grep=<pattern>\fR\&. .RE .PP @@ -1642,7 +1642,7 @@ and we are outputting in .PP \-\-expand\-tabs=<n>, \-\-expand\-tabs, \-\-no\-expand\-tabs .RS 4 -Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of +Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of \fI<n>\fR) in the log message before showing it in the output\&. \fB\-\-expand\-tabs\fR is a short\-hand for @@ -1687,7 +1687,7 @@ argument, use the ref to find the notes to display\&. The ref can specify the fu \fBrefs/\fR and otherwise \fBrefs/notes/\fR -is prefixed to form a full name of the ref\&. +is prefixed to form the full name of the ref\&. .sp Multiple \-\-notes options can be combined to control which notes are being displayed\&. Examples: "\-\-notes=foo" will show only notes from "refs/notes/foo"; "\-\-notes=foo \-\-notes" will show both notes from "refs/notes/foo" and from the default notes ref(s)\&. .RE @@ -3021,7 +3021,7 @@ $ git log \-2 \-\-pretty=%h 4da45bef .sp By default, \fBgit log\fR does not generate any diff output\&. The options below can be used to show the changes made by each commit\&. .sp -Note that unless one of \fB\-\-diff\-merges\fR variants (including short \fB\-m\fR, \fB\-c\fR, and \fB\-\-cc\fR options) is explicitly given, merge commits will not show a diff, even if a diff format like \fB\-\-patch\fR is selected, nor will they match search options like \fB\-S\fR\&. The exception is when \fB\-\-first\-parent\fR is in use, in which case \fBfirst\-parent\fR is the default format\&. +Note that unless one of \fB\-\-diff\-merges\fR variants (including short \fB\-m\fR, \fB\-c\fR, \fB\-\-cc\fR, and \fB\-\-dd\fR options) is explicitly given, merge commits will not show a diff, even if a diff format like \fB\-\-patch\fR is selected, nor will they match search options like \fB\-S\fR\&. The exception is when \fB\-\-first\-parent\fR is in use, in which case \fBfirst\-parent\fR is the default format for merge commits\&. .PP \-p, \-u, \-\-patch .RS 4 @@ -3039,7 +3039,47 @@ that show the patch by default to squelch their output, or to cancel the effect earlier on the command line in an alias\&. .RE .PP -\-\-diff\-merges=(off|none|on|first\-parent|1|separate|m|combined|c|dense\-combined|cc|remerge|r), \-\-no\-diff\-merges +\-m +.RS 4 +Show diffs for merge commits in the default format\&. This is similar to +\fI\-\-diff\-merges=on\fR, except +\fB\-m\fR +will produce no output unless +\fB\-p\fR +is given as well\&. +.RE +.PP +\-c +.RS 4 +Produce combined diff output for merge commits\&. Shortcut for +\fI\-\-diff\-merges=combined \-p\fR\&. +.RE +.PP +\-\-cc +.RS 4 +Produce dense combined diff output for merge commits\&. Shortcut for +\fI\-\-diff\-merges=dense\-combined \-p\fR\&. +.RE +.PP +\-\-dd +.RS 4 +Produce diff with respect to first parent for both merge and regular commits\&. Shortcut for +\fI\-\-diff\-merges=first\-parent \-p\fR\&. +.RE +.PP +\-\-remerge\-diff +.RS 4 +Produce remerge\-diff output for merge commits\&. Shortcut for +\fI\-\-diff\-merges=remerge \-p\fR\&. +.RE +.PP +\-\-no\-diff\-merges +.RS 4 +Synonym for +\fI\-\-diff\-merges=off\fR\&. +.RE +.PP +\-\-diff\-merges=<format> .RS 4 Specify diff format to be used for merge commits\&. Default is \fBoff\fR @@ -3048,57 +3088,51 @@ unless is in use, in which case \fBfirst\-parent\fR is the default\&. +.sp +The following formats are supported: .PP -\-\-diff\-merges=(off|none), \-\-no\-diff\-merges +off, none .RS 4 Disable output of diffs for merge commits\&. Useful to override implied value\&. .RE .PP -\-\-diff\-merges=on, \-\-diff\-merges=m, \-m +on, m .RS 4 -This option makes diff output for merge commits to be shown in the default format\&. -\fB\-m\fR -will produce the output only if -\fB\-p\fR -is given as well\&. The default format could be changed using +Make diff output for merge commits to be shown in the default format\&. The default format could be changed using \fBlog\&.diffMerges\fR -configuration parameter, which default value is +configuration variable, whose default value is \fBseparate\fR\&. .RE .PP -\-\-diff\-merges=first\-parent, \-\-diff\-merges=1 +first\-parent, 1 .RS 4 -This option makes merge commits show the full diff with respect to the first parent only\&. +Show full diff with respect to first parent\&. This is the same format as +\fB\-\-patch\fR +produces for non\-merge commits\&. .RE .PP -\-\-diff\-merges=separate +separate .RS 4 -This makes merge commits show the full diff with respect to each of the parents\&. Separate log entry and diff is generated for each parent\&. +Show full diff with respect to each of parents\&. Separate log entry and diff is generated for each parent\&. .RE .PP -\-\-diff\-merges=remerge, \-\-diff\-merges=r, \-\-remerge\-diff +combined, c .RS 4 -With this option, two\-parent merge commits are remerged to create a temporary tree object \(em potentially containing files with conflict markers and such\&. A diff is then shown between that temporary tree and the actual merge commit\&. -.sp -The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)\&. +Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time\&. Furthermore, it lists only files which were modified from all parents\&. .RE .PP -\-\-diff\-merges=combined, \-\-diff\-merges=c, \-c +dense\-combined, cc .RS 4 -With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time\&. Furthermore, it lists only files which were modified from all parents\&. -\fB\-c\fR -implies -\fB\-p\fR\&. +Further compress output produced by +\fB\-\-diff\-merges=combined\fR +by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&. .RE .PP -\-\-diff\-merges=dense\-combined, \-\-diff\-merges=cc, \-\-cc +remerge, r .RS 4 -With this option the output produced by -\fB\-\-diff\-merges=combined\fR -is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&. -\fB\-\-cc\fR -implies -\fB\-p\fR\&. +Remerge two\-parent merge commits to create a temporary tree object\(empotentially containing files with conflict markers and such\&. A diff is then shown between that temporary tree and the actual merge commit\&. +.sp +The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)\&. .RE .RE .PP @@ -3858,7 +3892,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE @@ -4012,7 +4046,7 @@ What the \-p option produces is slightly different from the traditional diff for .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header that looks like this: +It is preceded by a "git diff" header that looks like this: .sp .if n \{\ .RS 4 @@ -4038,11 +4072,11 @@ or \fBb/\fR filenames\&. .sp -When rename/copy is involved, +When a rename/copy is involved, \fBfile1\fR and \fBfile2\fR -show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&. +show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&. .RE .sp .RS 4 @@ -4142,11 +4176,11 @@ rename to a .\} Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in \fBgitattributes\fR(5) -for details of how to tailor to this to specific languages\&. +for details of how to tailor this to specific languages\&. .RE .SH "COMBINED DIFF FORMAT" .sp -Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&. +Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&. .sp A "combined diff" format looks like this: .sp @@ -4196,7 +4230,7 @@ index fabadb8,cc95eb0\&.\&.4866510 .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header, that looks like this (when the +It is preceded by a "git diff" header, that looks like this (when the \fB\-c\fR option is used): .sp @@ -4250,7 +4284,7 @@ deleted file mode <mode>,<mode> .sp The \fBmode <mode>,<mode>\&.\&.<mode>\fR -line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format\&. +line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&. .RE .sp .RS 4 @@ -4261,7 +4295,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex .sp -1 .IP " 3." 4.2 .\} -It is followed by two\-line from\-file/to\-file header +It is followed by a two\-line from\-file/to\-file header: .sp .if n \{\ .RS 4 @@ -4274,13 +4308,13 @@ It is followed by two\-line from\-file/to\-file header .RE .\} .sp -Similar to two\-line header for traditional +Similar to the two\-line header for the traditional \fIunified\fR diff format, \fB/dev/null\fR is used to signal created or deleted files\&. .sp -However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit +However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit: .sp .if n \{\ .RS 4 @@ -4330,7 +4364,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B .sp A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&. .sp -In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. +In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. .sp When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&. .SH "EXAMPLES" @@ -4463,7 +4497,7 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t \fIgit commit\fR and \fIgit commit\-tree\fR -issues a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have +issue a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have \fBi18n\&.commitEncoding\fR in \fB\&.git/config\fR @@ -4482,7 +4516,7 @@ file, like this: .sp Commit objects created with the above setting record the value of \fBi18n\&.commitEncoding\fR -in its +in their \fBencoding\fR header\&. This is to help other people who look at them later\&. Lack of this header implies that the commit log message is encoded in UTF\-8\&. .RE @@ -4570,7 +4604,7 @@ 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\&. +If the format is set to "auto:foo" and the pager is in use, format "foo" will be used for the date format\&. Otherwise, "default" will be used\&. .RE .PP log\&.decorate @@ -4678,7 +4712,7 @@ 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 of +\fBmanual\fR\&. See the "NOTES MERGE STRATEGIES" section of \fBgit-notes\fR(1) for more information on each strategy\&. .sp diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index 9a9d4e408..74060f9e1 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,9 +49,9 @@ git-ls-files \- Show information about files in the index and the working tree .sp .SH "DESCRIPTION" .sp -This merges the file listing in the index with the actual working directory list, and shows different combinations of the two\&. +This command merges the file listing in the index with the actual working directory list, and shows different combinations of the two\&. .sp -One or more of the options below may be used to determine the files shown, and each file may be printed multiple times if there are multiple entries in the index or multiple statuses are applicable for the relevant file selection options\&. +Several flags can be used to determine which files are shown, and each file may be printed multiple times if there are multiple entries in the index or if multiple statuses are applicable for the relevant file selection options\&. .SH "OPTIONS" .PP \-c, \-\-cached @@ -81,7 +81,7 @@ Show only ignored files in the output\&. Must be used with either an explicit or \fI\-o\fR\&. When showing files in the index (i\&.e\&. when used with \fI\-c\fR), print only those files matching an exclude pattern\&. When showing "other" files (i\&.e\&. when used with -\fI\-o\fR), show only those matched by an exclude pattern\&. Standard ignore rules are not automatically activated, therefore at least one of the +\fI\-o\fR), show only those matched by an exclude pattern\&. Standard ignore rules are not automatically activated; therefore, at least one of the \fB\-\-exclude*\fR options is required\&. .RE @@ -176,7 +176,7 @@ Show status tags together with filenames\&. Note that for scripting purposes, and \fBgit-diff-files\fR(1) \fB\-\-name\-status\fR -are almost always superior alternatives, and users should look at +are almost always superior alternatives; users should look at \fBgit-status\fR(1) \fB\-\-short\fR or diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index 1fe13b103..3a044e4ca 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 73e6979bc..4b302dccc 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index a5b5e8ca5..f5f6c136e 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MAILINFO" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -205,7 +205,7 @@ mailinfo\&.scissors 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 "\-")\&. +\fBgit-am\fR(1)) act by default as if the \-\-scissors option was provided on the command\-line\&. When active, this feature removes everything from the message body before a scissors line (i\&.e\&. consisting mainly of ">8", "8<" and "\-")\&. .RE .SH "GIT" .sp diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index 9b93a8806..aab8a7fc9 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -74,7 +74,7 @@ Directory in which to place the individual messages\&. .PP \-b .RS 4 -If any file doesn\(cqt begin with a From line, assume it is a single mail message instead of signaling error\&. +If any file doesn\(cqt begin with a From line, assume it is a single mail message instead of signaling an error\&. .RE .PP \-d<prec> diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index 2e6ad4f25..b77c0572f 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -184,7 +184,7 @@ task updates the object directory with the latest objects from all registered re command is run\&. The configured refspec is modified to place all requested refs within \fBrefs/prefetch/\fR\&. Also, tags are not updated\&. .sp -This is done to avoid disrupting the remote\-tracking branches\&. The end users expect these refs to stay unmoved unless they initiate a fetch\&. With prefetch task, however, the objects necessary to complete a later real fetch would already be obtained, so the real fetch would go faster\&. In the ideal case, it will just become an update to a bunch of remote\-tracking branches without any object transfer\&. +This is done to avoid disrupting the remote\-tracking branches\&. The end users expect these refs to stay unmoved unless they initiate a fetch\&. However, with the prefetch task, the objects necessary to complete a later real fetch would already be obtained, making the real fetch faster\&. In the ideal case, it will just become an update to a bunch of remote\-tracking branches without any object transfer\&. .RE .PP gc @@ -471,7 +471,7 @@ config value is set, then that value is used instead of the one provided by .sp -1 .IP \(bu 2.3 .\} -\fBnone\fR: This default setting implies no task are run at any schedule\&. +\fBnone\fR: This default setting implies no tasks are run at any schedule\&. .RE .sp .RS 4 diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index 7463d4480..66e640e3d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -41,10 +41,10 @@ git-merge-base \- Find as good common ancestors as possible for a merge .sp .SH "DESCRIPTION" .sp -\fIgit merge\-base\fR finds best common ancestor(s) between two commits to use in a three\-way merge\&. One common ancestor is \fIbetter\fR than another common ancestor if the latter is an ancestor of the former\&. A common ancestor that does not have any better common ancestor is a \fIbest common ancestor\fR, i\&.e\&. a \fImerge base\fR\&. Note that there can be more than one merge base for a pair of commits\&. +\fIgit merge\-base\fR finds the best common ancestor(s) between two commits to use in a three\-way merge\&. One common ancestor is \fIbetter\fR than another common ancestor if the latter is an ancestor of the former\&. A common ancestor that does not have any better common ancestor is a \fIbest common ancestor\fR, i\&.e\&. a \fImerge base\fR\&. Note that there can be more than one merge base for a pair of commits\&. .SH "OPERATION MODES" .sp -As the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits\&. +In the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits\&. .sp More generally, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line; the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line\&. .sp @@ -69,7 +69,7 @@ Check if the first <commit> is an ancestor of the second <commit>, and exit with .PP \-\-fork\-point .RS 4 -Find the point at which a branch (or any history that leads to <commit>) forked from another branch (or any reference) <ref>\&. This does not just look for the common ancestor of the two commits, but also takes into account the reflog of <ref> to see if the history leading to <commit> forked from an earlier incarnation of the branch <ref> (see discussion on this mode below)\&. +Find the point at which a branch (or any history that leads to <commit>) forked from another branch (or any reference) <ref>\&. This does not just look for the common ancestor of the two commits, but also takes into account the reflog of <ref> to see if the history leading to <commit> forked from an earlier incarnation of the branch <ref> (see discussion of this mode below)\&. .RE .SH "OPTIONS" .PP @@ -97,7 +97,7 @@ For example, with this topology: .sp the merge base between \fIA\fR and \fIB\fR is \fI1\fR\&. .sp -Given three commits \fIA\fR, \fIB\fR and \fIC\fR, \fBgit merge\-base A B C\fR will compute the merge base between \fIA\fR and a hypothetical commit \fIM\fR, which is a merge between \fIB\fR and \fIC\fR\&. For example, with this topology: +Given three commits \fIA\fR, \fIB\fR, and \fIC\fR, \fBgit merge\-base A B C\fR will compute the merge base between \fIA\fR and a hypothetical commit \fIM\fR, which is a merge between \fIB\fR and \fIC\fR\&. For example, with this topology: .sp .if n \{\ .RS 4 @@ -149,7 +149,7 @@ When the history involves criss\-cross merges, there can be more than one \fIbes .RE .\} .sp -both \fI1\fR and \fI2\fR are merge\-bases of A and B\&. Neither one is better than the other (both are \fIbest\fR merge bases)\&. When the \fB\-\-all\fR option is not given, it is unspecified which best one is output\&. +both \fI1\fR and \fI2\fR are merge bases of A and B\&. Neither one is better than the other (both are \fIbest\fR merge bases)\&. When the \fB\-\-all\fR option is not given, it is unspecified which best one is output\&. .sp A common idiom to check "fast\-forward\-ness" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B\&. You will see this idiom used often in older scripts\&. .sp @@ -233,7 +233,7 @@ $ git rebase \-\-onto origin/master $fork_point topic .RE .\} .sp -will replay D0, D1 and D on top of B to create a new history of this shape: +will replay D0, D1, and D on top of B to create a new history of this shape: .sp .if n \{\ .RS 4 diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index 28c7d6e1e..8b7061bc3 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index f2fce6f02..5cbabb893 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1 index 4283fa48a..6fe0efefb 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE\-ONE\-FILE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE\-ONE\-FILE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index 392d73afb..6f4bca9b0 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -38,11 +38,11 @@ git-merge-tree \- Perform merge without touching index or working tree .sp .SH "DESCRIPTION" .sp -This command has a modern \fB\-\-write\-tree\fR mode and a deprecated \fB\-\-trivial\-merge\fR mode\&. With the exception of the DEPRECATED DESCRIPTION section at the end, the rest of this documentation describes modern \fB\-\-write\-tree\fR mode\&. +This command has a modern \fB\-\-write\-tree\fR mode and a deprecated \fB\-\-trivial\-merge\fR mode\&. With the exception of the DEPRECATED DESCRIPTION section at the end, the rest of this documentation describes the modern \fB\-\-write\-tree\fR mode\&. .sp Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index\&. .sp -The performed merge will use the same feature as the "real" \fBgit-merge\fR(1), including: +The performed merge will use the same features as the "real" \fBgit-merge\fR(1), including: .sp .RS 4 .ie n \{\ @@ -416,9 +416,9 @@ Do NOT look through the resulting toplevel tree to try to find which files confl .sp Do NOT interpret an empty Conflicted file info list as a clean merge; check the exit status\&. A merge can have conflicts without having individual files conflict (there are a few types of directory rename conflicts that fall into this category, and others might also be added in the future)\&. .sp -Do NOT attempt to guess or make the user guess the conflict types from the Conflicted file info list\&. The information there is insufficient to do so\&. For example: Rename/rename(1to2) conflicts (both sides renamed the same file differently) will result in three different file having higher order stages (but each only has one higher order stage), with no way (short of the Informational messages section) to determine which three files are related\&. File/directory conflicts also result in a file with exactly one higher order stage\&. Possibly\-involved\-in\-directory\-rename conflicts (when "merge\&.directoryRenames" is unset or set to "conflicts") also result in a file with exactly one higher order stage\&. In all cases, the Informational messages section has the necessary info, though it is not designed to be machine parseable\&. +Do NOT attempt to guess or make the user guess the conflict types from the Conflicted file info list\&. The information there is insufficient to do so\&. For example: Rename/rename(1to2) conflicts (both sides renamed the same file differently) will result in three different files having higher order stages (but each only has one higher order stage), with no way (short of the Informational messages section) to determine which three files are related\&. File/directory conflicts also result in a file with exactly one higher order stage\&. Possibly\-involved\-in\-directory\-rename conflicts (when "merge\&.directoryRenames" is unset or set to "conflicts") also result in a file with exactly one higher order stage\&. In all cases, the Informational messages section has the necessary info, though it is not designed to be machine parseable\&. .sp -Do NOT assume that each paths from Conflicted file info, and the logical conflicts in the Informational messages have a one\-to\-one mapping, nor that there is a one\-to\-many mapping, nor a many\-to\-one mapping\&. Many\-to\-many mappings exist, meaning that each path can have many logical conflict types in a single merge, and each logical conflict type can affect many paths\&. +Do NOT assume that each path from Conflicted file info, and the logical conflicts in the Informational messages have a one\-to\-one mapping, nor that there is a one\-to\-many mapping, nor a many\-to\-one mapping\&. Many\-to\-many mappings exist, meaning that each path can have many logical conflict types in a single merge, and each logical conflict type can affect many paths\&. .sp Do NOT assume all filenames listed in the Informational messages section had conflicts\&. Messages can be included for files that have no conflicts, such as "Auto\-merging <file>"\&. .sp diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 70c3e5101..20d295e50 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -609,7 +609,7 @@ You can work through the conflict with a number of tools: .\} Use a mergetool\&. \fBgit mergetool\fR -to launch a graphical mergetool which will work you through the merge\&. +to launch a graphical mergetool which will work through the merge with you\&. .RE .sp .RS 4 @@ -965,7 +965,7 @@ marker\&. An alternate style, "diff3", adds a \fB|||||||\fR marker and the original text before the \fB=======\fR -marker\&. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides they are just pulled out of the conflict region\&. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region\&. +marker\&. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region\&. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region\&. .RE .PP merge\&.defaultToUpstream diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index f8dc2f87d..52fb22f79 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ Before sourcing \fIgit\-mergetool\-\-lib\fR, your script must set \fBTOOL_MODE\f .PP get_merge_tool .RS 4 -returns a merge tool\&. the return code is 1 if we returned a guessed merge tool, else 0\&. +Returns a merge tool\&. The return code is 1 if we returned a guessed merge tool, else 0\&. \fI$GIT_MERGETOOL_GUI\fR may be set to \fItrue\fR @@ -55,22 +55,22 @@ to search for the appropriate guitool\&. .PP get_merge_tool_cmd .RS 4 -returns the custom command for a merge tool\&. +Returns the custom command for a merge tool\&. .RE .PP get_merge_tool_path .RS 4 -returns the custom path for a merge tool\&. +Returns the custom path for a merge tool\&. .RE .PP initialize_merge_tool .RS 4 -bring merge tool specific functions into scope so they can be used or overridden\&. +Brings merge tool specific functions into scope so they can be used or overridden\&. .RE .PP run_merge_tool .RS 4 -launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present\&. +Launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present\&. \fI$MERGED\fR, \fI$LOCAL\fR, \fI$REMOTE\fR, and diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 24d1c33e9..1c7f77849 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,7 +39,7 @@ git-mergetool \- Run merge conflict resolution tools to resolve merge conflicts .sp Use \fBgit mergetool\fR to run one of several merge utilities to resolve merge conflicts\&. It is typically run after \fIgit merge\fR\&. .sp -If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts)\&. Specifying a directory will include all unresolved files in that path\&. If no <file> names are specified, \fIgit mergetool\fR will run the merge tool program on every file with merge conflicts\&. +If one or more <file> parameters are given, the merge tool program will be run to resolve differences in each file (skipping those without conflicts)\&. Specifying a directory will include all unresolved files in that path\&. If no <file> names are specified, \fIgit mergetool\fR will run the merge tool program on every file with merge conflicts\&. .SH "OPTIONS" .PP \-t <tool>, \-\-tool=<tool> @@ -76,7 +76,7 @@ or \fB\-\-tool\fR option or the \fBmerge\&.tool\fR -configuration variable) the configured command line will be invoked with +configuration variable), the configured command line will be invoked with \fB$BASE\fR set to the name of a temporary file containing the common base for the merge, if available; \fB$LOCAL\fR @@ -122,7 +122,7 @@ is invoked with the \fB\-g\fR or \fB\-\-gui\fR -option the default merge tool will be read from the configured +option, the default merge tool will be read from the configured \fBmerge\&.guitool\fR variable instead of \fBmerge\&.tool\fR\&. If @@ -187,7 +187,7 @@ for the full description\&. .PP mergetool\&.<tool>\&.trustExitCode .RS 4 -For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful\&. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge\&. +For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful\&. If this is not set to true then the merge target file timestamp is checked, and the merge is assumed to have been successful if the file has been updated; otherwise, the user is prompted to indicate the success of the merge\&. .RE .PP mergetool\&.meld\&.hasOutput @@ -219,7 +219,7 @@ mergetool\&.meld\&.useAutoMerge .RS 4 When the \fB\-\-auto\-merge\fR -is given, meld will merge all non\-conflicting parts automatically, highlight the conflicting parts and wait for user decision\&. Setting +is given, meld will merge all non\-conflicting parts automatically, highlight the conflicting parts, and wait for user decision\&. Setting \fBmergetool\&.meld\&.useAutoMerge\fR to \fBtrue\fR @@ -241,12 +241,12 @@ altogether, and is the default value\&. .PP mergetool\&.vimdiff\&.layout .RS 4 -The vimdiff backend uses this variable to control how its split windows look like\&. Applies even if you are using Neovim (\fBnvim\fR) or gVim (\fBgvim\fR) as the merge tool\&. See BACKEND SPECIFIC HINTS section for details\&. +The vimdiff backend uses this variable to control how its split windows appear\&. Applies even if you are using Neovim (\fBnvim\fR) or gVim (\fBgvim\fR) as the merge tool\&. See BACKEND SPECIFIC HINTS section for details\&. .RE .PP mergetool\&.hideResolved .RS 4 -During a merge Git will automatically resolve as many conflicts as possible and write the +During a merge, Git will automatically resolve as many conflicts as possible and write the \fIMERGED\fR file containing conflict markers around any conflicts that it cannot resolve; \fILOCAL\fR @@ -276,7 +276,7 @@ then this file is not preserved\&. Defaults to mergetool\&.keepTemporaries .RS 4 When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool\&. If the tool returns an error and this variable is set to -\fBtrue\fR, then these temporary files will be preserved, otherwise they will be removed after the tool has exited\&. Defaults to +\fBtrue\fR, then these temporary files will be preserved; otherwise, they will be removed after the tool has exited\&. Defaults to \fBfalse\fR\&. .RE .PP @@ -323,7 +323,7 @@ to be used\&. .sp \fBgit mergetool\fR creates \fB*\&.orig\fR backup files while resolving merges\&. These are safe to remove once a file has been merged and its \fBgit mergetool\fR session has completed\&. .sp -Setting the \fBmergetool\&.keepBackup\fR configuration variable to \fBfalse\fR causes \fBgit mergetool\fR to automatically remove the backup as files are successfully merged\&. +Setting the \fBmergetool\&.keepBackup\fR configuration variable to \fBfalse\fR causes \fBgit mergetool\fR to automatically remove the backup files as files are successfully merged\&. .SH "BACKEND SPECIFIC HINTS" .SS "vimdiff" .sp @@ -415,12 +415,12 @@ is used to "open a new horizontal split" .IP \(bu 2.3 .\} \fB@\fR -is used to indicate which is the file containing the final version after solving the conflicts\&. If not present, +is used to indicate the file containing the final version after solving the conflicts\&. If not present, \fBMERGED\fR will be used by default\&. .RE .sp -The precedence of the operators is this one (you can use parentheses to change it): +The precedence of the operators is as follows (you can use parentheses to change it): .sp .if n \{\ .RS 4 @@ -665,7 +665,7 @@ Same as the previous example, but adds a fourth tab with the same information as .RE .\} .sp -Note how in the third tab definition we need to use parenthesis to make +Note how in the third tab definition we need to use parentheses to make \fB,\fR have precedence over \fB/\fR\&. diff --git a/man1/git-mktag.1 b/man1/git-mktag.1 index 658379322..31473b717 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MKTAG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MKTAG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-mktag \- Creates a tag object with extra validation .sp .SH "DESCRIPTION" .sp -Reads a tag contents on standard input and creates a tag object\&. The output is the new tag\(cqs <object> identifier\&. +Reads a tag\(cqs contents on standard input and creates a tag object\&. The output is the new tag\(cqs <object> identifier\&. .sp This command is mostly equivalent to \fBgit-hash-object\fR(1) invoked with \fB\-t tag \-w \-\-stdin\fR\&. I\&.e\&. both of these will create and write a tag found in \fBmy\-tag\fR: .sp @@ -54,7 +54,7 @@ git hash\-object \-t tag \-w \-\-stdin <my\-tag .sp The difference is that mktag will die before writing the tag if the tag doesn\(cqt pass a \fBgit-fsck\fR(1) check\&. .sp -The "fsck" check done mktag is stricter than what \fBgit-fsck\fR(1) would run by default in that all \fBfsck\&.<msg\-id>\fR messages are promoted from warnings to errors (so e\&.g\&. a missing "tagger" line is an error)\&. +The "fsck" check done by mktag is stricter than what \fBgit-fsck\fR(1) would run by default in that all \fBfsck\&.<msg\-id>\fR messages are promoted from warnings to errors (so e\&.g\&. a missing "tagger" line is an error)\&. .sp Extra headers in the object are also an error under mktag, but ignored by \fBgit-fsck\fR(1)\&. This extra check can be turned off by setting the appropriate \fBfsck\&.<msg\-id>\fR variable: .sp @@ -95,7 +95,7 @@ tagger <tagger> .RE .\} .sp -followed by some \fIoptional\fR free\-form message (some tags created by older Git may not have \fBtagger\fR line)\&. The message, when it exists, is separated by a blank line from the header\&. The message part may contain a signature that Git itself doesn\(cqt care about, but that can be verified with gpg\&. +followed by some \fIoptional\fR free\-form message (some tags created by older Git may not have a \fBtagger\fR line)\&. The message, when it exists, is separated by a blank line from the header\&. The message part may contain a signature that Git itself doesn\(cqt care about, but that can be verified with gpg\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 index 1d944d1dd..53fc8947c 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MKTREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MKTREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,12 +49,12 @@ output instead\&. .PP \-\-missing .RS 4 -Allow missing objects\&. The default behaviour (without this option) is to verify that each tree entry\(cqs sha1 identifies an existing object\&. This option has no effect on the treatment of gitlink entries (aka "submodules") which are always allowed to be missing\&. +Allow missing objects\&. The default behaviour (without this option) is to verify that each tree entry\(cqs hash identifies an existing object\&. This option has no effect on the treatment of gitlink entries (aka "submodules") which are always allowed to be missing\&. .RE .PP \-\-batch .RS 4 -Allow building of more than one tree object before exiting\&. Each tree is separated by a single blank line\&. The final new\-line is optional\&. Note \- if the +Allow building of more than one tree object before exiting\&. Each tree is separated by a single blank line\&. The final newline is optional\&. Note \- if the \fB\-z\fR option is used, lines are terminated with NUL\&. .RE diff --git a/man1/git-multi-pack-index.1 b/man1/git-multi-pack-index.1 index 8699dbc7b..42c0efba2 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MULTI\-PACK\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MULTI\-PACK\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mv.1 b/man1/git-mv.1 index 26af2bf3d..12a9eeac4 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-MV" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-MV" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-mv \- Move or rename a file, a directory, or a symlink .sp .SH "DESCRIPTION" .sp -Move or rename a file, directory or symlink\&. +Move or rename a file, directory, or symlink\&. .sp .if n \{\ .RS 4 diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index c2be91683..4f8487533 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-NAME\-REV" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-NAME\-REV" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -48,7 +48,7 @@ Do not use branch names, but only tags to name the commits .PP \-\-refs=<pattern> .RS 4 -Only use refs whose names match a given shell pattern\&. The pattern can be one of branch name, tag name or fully qualified ref name\&. If given multiple times, use refs whose names match any of the given shell patterns\&. Use +Only use refs whose names match a given shell pattern\&. The pattern can be a branch name, a tag name, or a fully qualified ref name\&. If given multiple times, use refs whose names match any of the given shell patterns\&. Use \fB\-\-no\-refs\fR to clear any previous ref patterns given\&. .RE diff --git a/man1/git-notes.1 b/man1/git-notes.1 index 1426f9960..4c7841855 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-NOTES" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-NOTES" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -355,7 +355,7 @@ 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 of +\fBmanual\fR\&. See the "NOTES MERGE STRATEGIES" section of \fBgit-notes\fR(1) for more information on each strategy\&. .sp diff --git a/man1/git-p4.1 b/man1/git-p4.1 index ae0918be6..973053e5d 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-P4" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-P4" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index acded6ee0..4146f7eb2 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PACK\-OBJECTS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index 733951d42..f90140fa2 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PACK\-REDUNDANT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PACK\-REDUNDANT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1 index f63d88cff..0e9ee65cc 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PACK\-REFS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PACK\-REFS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1 index 9a223d492..cc598e553 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PATCH\-ID" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PATCH\-ID" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1 index 8d347fe5b..d1c560259 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PRUNE\-PACKED" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PRUNE\-PACKED" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-prune-packed \- Remove extra objects that are already in pack files .sp .SH "DESCRIPTION" .sp -This program searches the \fB$GIT_OBJECT_DIRECTORY\fR for all objects that currently exist in a pack file as well as the independent object directories\&. +This program searches the \fB$GIT_OBJECT_DIRECTORY\fR for all objects that currently exist in a pack file as well as in the independent object directories\&. .sp All such extra objects are removed\&. .sp diff --git a/man1/git-prune.1 b/man1/git-prune.1 index a67a9f3cd..c89d2d774 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PRUNE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PRUNE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -53,7 +53,7 @@ In most cases, users should run \fIgit gc\fR, which calls \fIgit prune\fR\&. See .sp .5v .RE .sp -This runs \fIgit fsck \-\-unreachable\fR using all the refs available in \fBrefs/\fR, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database\&. In addition, it prunes the unpacked objects that are also found in packs by running \fIgit prune\-packed\fR\&. It also removes entries from \&.git/shallow that are not reachable by any ref\&. +This runs \fIgit fsck \-\-unreachable\fR using all the refs available in \fBrefs/\fR, optionally with an additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database\&. In addition, it prunes the unpacked objects that are also found in packs by running \fIgit prune\-packed\fR\&. It also removes entries from \&.git/shallow that are not reachable by any ref\&. .sp Note that unreachable, packed objects will remain\&. If this is not desired, see \fBgit-repack\fR(1)\&. .SH "OPTIONS" diff --git a/man1/git-pull.1 b/man1/git-pull.1 index c69069dad..b0efd14ff 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PULL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PULL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -383,7 +383,7 @@ If the source repository is shallow, fetch as much as possible so that the curre .RS 4 By default when fetching from a shallow repository, \fBgit fetch\fR -refuses refs that require updating \&.git/shallow\&. This option updates \&.git/shallow and accept such refs\&. +refuses refs that require updating \&.git/shallow\&. This option updates \&.git/shallow and accepts such refs\&. .RE .PP \-\-negotiation\-tip=<commit|glob> @@ -441,7 +441,7 @@ When \fIgit fetch\fR is used with \fB<src>:<dst>\fR -refspec it may refuse to update the local branch as discussed in the +refspec, it may refuse to update the local branch as discussed in the \fB<refspec>\fR part of the \fBgit-fetch\fR(1) @@ -633,7 +633,7 @@ Unlike when pushing with will be accepted without \fB+\fR in the refspec (or -\fB\-\-force\fR), whether that\(cqs swapping e\&.g\&. a tree object for a blob, or a commit for another commit that\(cqs doesn\(cqt have the previous commit as an ancestor etc\&. +\fB\-\-force\fR), whether that\(cqs swapping e\&.g\&. a tree object for a blob, or a commit for another commit that doesn\(cqt have the previous commit as an ancestor etc\&. .sp Unlike when pushing with \fBgit-push\fR(1), there is no configuration which\(cqll amend these rules, and nothing like a @@ -643,9 +643,9 @@ hook analogous to the hook\&. .sp As with pushing with -\fBgit-push\fR(1), all of the rules described above about what\(cqs not allowed as an update can be overridden by adding an the optional leading +\fBgit-push\fR(1), all of the rules described above about what\(cqs not allowed as an update can be overridden by adding an optional leading \fB+\fR -to a refspec (or using +to a refspec (or using the \fB\-\-force\fR command line option)\&. The only exception to this is that no amount of forcing will make the \fBrefs/heads/*\fR @@ -662,7 +662,7 @@ namespace accept a non\-commit object\&. \fBNote\fR .ps -1 .br -When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote\-tracking branch the last time you fetched)\&. You would want to use the +When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be a descendant of its previous tip (as stored in your remote\-tracking branch the last time you fetched)\&. You would want to use the \fB+\fR sign to indicate non\-fast\-forward updates will be needed for such branches\&. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch\&. .sp .5v @@ -699,7 +699,7 @@ configuration and merge only the first <refspec> found into the current branch\& .sp In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository\&. Depending on the transport protocol, some of this information may be absent\&. .sp -Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)\&. +Git supports ssh, git, http, and https protocols (in addition, ftp and ftps can be used for fetching, but this is inefficient and deprecated; do not use them)\&. .sp The native transport (i\&.e\&. git:// URL) does no authentication and should be used with caution on unsecured networks\&. .sp @@ -964,7 +964,7 @@ You can choose to provide the name of a remote which you had previously configur .\} .sp .sp -The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. +The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. .SS "Named file in \fB$GIT_DIR/remotes\fR" .sp You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The URL in this file will be used to access the repository\&. The refspec in this file will be used as default when you do not provide a refspec on the command line\&. This file should have the following format: @@ -973,7 +973,7 @@ You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The UR .RS 4 .\} .nf - URL: one of the above URL format + URL: one of the above URL formats Push: <refspec> Pull: <refspec> .fi diff --git a/man1/git-push.1 b/man1/git-push.1 index e73276300..89b35a403 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 <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-PUSH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-PUSH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -55,7 +55,7 @@ When neither the command\-line nor the configuration specifies what to push, the .PP <repository> .RS 4 -The "remote" repository that is destination of a push operation\&. This parameter can be either a URL (see the section +The "remote" repository that is the destination of a push operation\&. This parameter can be either a URL (see the section GIT URLS below) or the name of a remote (see the section REMOTES @@ -534,7 +534,7 @@ Use IPv6 addresses only, ignoring IPv4 addresses\&. .sp In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository\&. Depending on the transport protocol, some of this information may be absent\&. .sp -Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)\&. +Git supports ssh, git, http, and https protocols (in addition, ftp and ftps can be used for fetching, but this is inefficient and deprecated; do not use them)\&. .sp The native transport (i\&.e\&. git:// URL) does no authentication and should be used with caution on unsecured networks\&. .sp @@ -799,7 +799,7 @@ You can choose to provide the name of a remote which you had previously configur .\} .sp .sp -The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. +The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. .SS "Named file in \fB$GIT_DIR/remotes\fR" .sp You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The URL in this file will be used to access the repository\&. The refspec in this file will be used as default when you do not provide a refspec on the command line\&. This file should have the following format: @@ -808,7 +808,7 @@ You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The UR .RS 4 .\} .nf - URL: one of the above URL format + URL: one of the above URL formats Push: <refspec> Pull: <refspec> .fi @@ -1323,7 +1323,7 @@ is probably what you want\&. Possible values are: .IP \(bu 2.3 .\} \fBsimple\fR -\- pushes the current branch with the same name on the remote\&. +\- push 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\&. @@ -1362,7 +1362,7 @@ is the new default)\&. .PP push\&.followTags .RS 4 -If set to true enable +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\&. diff --git a/man1/git-quiltimport.1 b/man1/git-quiltimport.1 index f9600598f..3c9788d02 100644 --- a/man1/git-quiltimport.1 +++ b/man1/git-quiltimport.1 @@ -2,12 +2,12 @@ .\" Title: git-quiltimport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-QUILTIMPORT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-QUILTIMPORT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -50,7 +50,7 @@ If a subject is not found in the patch description the patch name is preserved a Walk through the patches in the series and warn if we cannot find all of the necessary information to commit a patch\&. At the time of this writing only missing author information is warned about\&. .RE .PP -\-\-author Author Name <Author Email> +\-\-author \fIAuthor Name <Author Email>\fR .RS 4 The author name and email address to use when no author information can be found in the patch description\&. .RE @@ -59,7 +59,9 @@ The author name and email address to use when no author information can be found .RS 4 The directory to find the quilt patches\&. .sp -The default for the patch directory is patches or the value of the +The default for the patch directory is +\fIpatches\fR +or the value of the \fB$QUILT_PATCHES\fR environment variable\&. .RE diff --git a/man1/git-range-diff.1 b/man1/git-range-diff.1 index df25fcc32..8036b41c7 100644 --- a/man1/git-range-diff.1 +++ b/man1/git-range-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-range-diff .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-RANGE\-DIFF" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-RANGE\-DIFF" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -131,7 +131,7 @@ to revert to color all lines according to the outer diff markers (and completely Set the creation/deletion cost fudge factor to \fB<percent>\fR\&. Defaults to 60\&. Try a larger value if \fBgit range\-diff\fR -erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case\&. See the ``Algorithm`` section below for an explanation why this is needed\&. +erroneously considers a large change a total rewrite (deletion of one commit and addition of another), and a smaller one in the reverse case\&. See the ``Algorithm`` section below for an explanation of why this is needed\&. .RE .PP \-\-left\-only diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index bc55caac6..347945be1 100644 --- a/man1/git-read-tree.1 +++ b/man1/git-read-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-read-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-READ\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -43,12 +43,12 @@ Reads the tree information given by <tree\-ish> into the index, but does not act .sp Optionally, it can merge a tree into the index, perform a fast\-forward (i\&.e\&. 2\-way) merge, or a 3\-way merge, with the \fB\-m\fR flag\&. When used with \fB\-m\fR, the \fB\-u\fR flag causes it to also update the files in the work tree with the result of the merge\&. .sp -Trivial merges are done by \fIgit read\-tree\fR itself\&. Only conflicting paths will be in unmerged state when \fIgit read\-tree\fR returns\&. +Only trivial merges are done by \fIgit read\-tree\fR itself\&. Only conflicting paths will be in an unmerged state when \fIgit read\-tree\fR returns\&. .SH "OPTIONS" .PP \-m .RS 4 -Perform a merge, not just a read\&. The command will refuse to run if your index file has unmerged entries, indicating that you have not finished previous merge you started\&. +Perform a merge, not just a read\&. The command will refuse to run if your index file has unmerged entries, indicating that you have not finished a previous merge you started\&. .RE .PP \-\-reset diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 5286174ba..bd43e03e4 100644 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -2,12 +2,12 @@ .\" Title: git-rebase .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REBASE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REBASE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2145,7 +2145,7 @@ Text editor used by \fBgit rebase \-i\fR for editing the rebase instruction file\&. The value is meant to be interpreted by the shell when it is used\&. It can be overridden by the \fBGIT_SEQUENCE_EDITOR\fR -environment variable\&. When not configured the default commit message editor is used instead\&. +environment variable\&. When not configured, the default commit message editor is used instead\&. .RE .SH "GIT" .sp diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index fb6cf46be..7e10f59c3 100644 --- a/man1/git-receive-pack.1 +++ b/man1/git-receive-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-receive-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-RECEIVE\-PACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-RECEIVE\-PACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,9 +39,9 @@ git-receive-pack \- Receive what is pushed into the repository .sp Invoked by \fIgit send\-pack\fR and updates the repository with the information fed from the remote end\&. .sp -This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit send\-pack\fR side, and the program pair is meant to be used to push updates to remote repository\&. For pull operations, see \fBgit-fetch-pack\fR(1)\&. +This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit send\-pack\fR side, and the program pair is meant to be used to push updates to a remote repository\&. For pull operations, see \fBgit-fetch-pack\fR(1)\&. .sp -The command allows for creation and fast\-forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end \fIgit\-receive\-pack\fR runs, but to the user who is sitting at the send\-pack end, it is updating the remote\&. Confused?) +The command allows for the creation and fast\-forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end \fIgit\-receive\-pack\fR runs, but to the user who is sitting at the send\-pack end, it is updating the remote\&. Confused?) .sp There are other real\-world examples of using update and post\-update hooks found in the Documentation/howto directory\&. .sp diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index aff4be637..61ab726b5 100644 --- a/man1/git-reflog.1 +++ b/man1/git-reflog.1 @@ -2,12 +2,12 @@ .\" Title: git-reflog .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REFLOG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REFLOG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-ext.1 b/man1/git-remote-ext.1 index c9fbe83ca..5dc90f55c 100644 --- a/man1/git-remote-ext.1 +++ b/man1/git-remote-ext.1 @@ -2,12 +2,12 @@ .\" Title: git-remote-ext .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REMOTE\-EXT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REMOTE\-EXT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -68,15 +68,15 @@ Replaced with long name (git\-receive\-pack, git\-upload\-pack, or git\-upload\- \fI%G\fR (must be the first characters in an argument) .RS 4 This argument will not be passed to -\fI<command>\fR\&. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and the repository field set to rest of the argument\&. Default is not to send such a request\&. +\fI<command>\fR\&. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and the repository field set to the rest of the argument\&. Default is not to send such a request\&. .sp -This is useful if remote side is git:// server accessed over some tunnel\&. +This is useful if the remote side is git:// server accessed over some tunnel\&. .RE .PP \fI%V\fR (must be first characters in argument) .RS 4 This argument will not be passed to -\fI<command>\fR\&. Instead it sets the vhost field in the git:// service request (to rest of the argument)\&. Default is not to send vhost in such request (if sent)\&. +\fI<command>\fR\&. Instead it sets the vhost field in the git:// service request (to the rest of the argument)\&. Default is not to send vhost in such request (if sent)\&. .RE .SH "ENVIRONMENT VARIABLES" .PP @@ -101,12 +101,12 @@ This remote helper is transparently used by Git when you use commands such as "g .PP "ext::ssh \-i /home/foo/\&.ssh/somekey user@host\&.example %S \fIfoo/repo\fR" .RS 4 -Like host\&.example:foo/repo, but use /home/foo/\&.ssh/somekey as keypair and user as user on remote side\&. This avoids needing to edit \&.ssh/config\&. +Like host\&.example:foo/repo, but use /home/foo/\&.ssh/somekey as keypair and user as the user on the remote side\&. This avoids the need to edit \&.ssh/config\&. .RE .PP "ext::socat \-t3600 \- ABSTRACT\-CONNECT:/git\-server %G/somerepo" .RS 4 -Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git\-server\&. +Represents repository with path /somerepo accessible over git protocol at the abstract namespace address /git\-server\&. .RE .PP "ext::git\-server\-alias foo %G/repo" diff --git a/man1/git-remote-fd.1 b/man1/git-remote-fd.1 index 522d30e13..053ada926 100644 --- a/man1/git-remote-fd.1 +++ b/man1/git-remote-fd.1 @@ -2,12 +2,12 @@ .\" Title: git-remote-fd .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REMOTE\-FD" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REMOTE\-FD" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,13 +34,13 @@ git-remote-fd \- Reflect smart transport stream back to caller "fd::<infd>[,<outfd>][/<anything>]" (as URL) .SH "DESCRIPTION" .sp -This helper uses specified file descriptors to connect to a remote Git server\&. This is not meant for end users but for programs and scripts calling git fetch, push or archive\&. +This helper uses specified file descriptors to connect to a remote Git server\&. This is not meant for end users but for programs and scripts calling git fetch, push, or archive\&. .sp -If only <infd> is given, it is assumed to be a bidirectional socket connected to remote Git server (git\-upload\-pack, git\-receive\-pack or git\-upload\-archive)\&. If both <infd> and <outfd> are given, they are assumed to be pipes connected to a remote Git server (<infd> being the inbound pipe and <outfd> being the outbound pipe\&. +If only <infd> is given, it is assumed to be a bidirectional socket connected to a remote Git server (git\-upload\-pack, git\-receive\-pack, or git\-upload\-archive)\&. If both <infd> and <outfd> are given, they are assumed to be pipes connected to a remote Git server (<infd> being the inbound pipe and <outfd> being the outbound pipe)\&. .sp It is assumed that any handshaking procedures have already been completed (such as sending service request for git://) before this helper is started\&. .sp -<anything> can be any string\&. It is ignored\&. It is meant for providing information to user in the URL in case that URL is displayed in some context\&. +<anything> can be any string\&. It is ignored\&. It is meant for providing information to the user in the URL in case that URL is displayed in some context\&. .SH "ENVIRONMENT VARIABLES" .PP GIT_TRANSLOOP_DEBUG @@ -61,7 +61,7 @@ Same as above\&. .PP \fBgit push fd::7,8 master (as URL)\fR .RS 4 -Push master, using file descriptor #7 to read data from git\-receive\-pack and file descriptor #8 to write data to same service\&. +Push master, using file descriptor #7 to read data from git\-receive\-pack and file descriptor #8 to write data to the same service\&. .RE .PP \fBgit push fd::7,8/bar master\fR diff --git a/man1/git-remote.1 b/man1/git-remote.1 index 83d344844..4943784db 100644 --- a/man1/git-remote.1 +++ b/man1/git-remote.1 @@ -2,12 +2,12 @@ .\" Title: git-remote .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REMOTE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REMOTE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-repack.1 b/man1/git-repack.1 index 0b2aa5c6e..73601fa76 100644 --- a/man1/git-repack.1 +++ b/man1/git-repack.1 @@ -2,12 +2,12 @@ .\" Title: git-repack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REPACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REPACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -264,7 +264,7 @@ Exclude the given pack from repacking\&. This is the equivalent of having file on the pack\&. \fB<pack\-name>\fR is the pack file name without leading directory (e\&.g\&. -\fBpack\-123\&.pack\fR)\&. The option could be specified multiple times to keep multiple packs\&. +\fBpack\-123\&.pack\fR)\&. The option can be specified multiple times to keep multiple packs\&. .RE .PP \-\-unpack\-unreachable=<when> @@ -302,7 +302,7 @@ Unlike other repack modes, the set of objects to pack is determined uniquely by .sp When \fB\-\-unpacked\fR -is specified, loose objects are implicitly included in this "roll\-up", without respect to their reachability\&. This is subject to change in the future\&. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of option to +is specified, loose objects are implicitly included in this "roll\-up", without respect to their reachability\&. This is subject to change in the future\&. This option (implying a drastically different repack mode) is not guaranteed to work with all other combinations of options to \fBgit repack\fR\&. .sp When writing a multi\-pack bitmap, diff --git a/man1/git-replace.1 b/man1/git-replace.1 index beb424975..8b5822dec 100644 --- a/man1/git-replace.1 +++ b/man1/git-replace.1 @@ -2,12 +2,12 @@ .\" Title: git-replace .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REPLACE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REPLACE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -54,7 +54,7 @@ There is no other restriction on the replaced and replacement objects\&. Merge c .sp Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck)\&. .sp -It is possible to disable use of replacement references for any command using the \fB\-\-no\-replace\-objects\fR option just after \fIgit\fR\&. +It is possible to disable the use of replacement references for any command using the \fB\-\-no\-replace\-objects\fR option just after \fIgit\fR\&. .sp For example if commit \fIfoo\fR has been replaced by commit \fIbar\fR: .sp @@ -141,7 +141,7 @@ and .RE .SH "FORMATS" .sp -The following format are available: +The following formats are available: .sp .RS 4 .ie n \{\ diff --git a/man1/git-request-pull.1 b/man1/git-request-pull.1 index cc444585a..9b3297ea9 100644 --- a/man1/git-request-pull.1 +++ b/man1/git-request-pull.1 @@ -2,12 +2,12 @@ .\" Title: git-request-pull .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REQUEST\-PULL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REQUEST\-PULL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-request-pull \- Generates a summary of pending changes .sp .SH "DESCRIPTION" .sp -Generate a request asking your upstream project to pull changes into their tree\&. The request, printed to the standard output, begins with the branch description, summarizes the changes and indicates from where they can be pulled\&. +Generate a request asking your upstream project to pull changes into their tree\&. The request, printed to the standard output, begins with the branch description, summarizes the changes, and indicates from where they can be pulled\&. .sp The upstream project is expected to have the commit named by \fB<start>\fR and the output asks it to integrate the changes you made since that commit, up to the commit named by \fB<end>\fR, by visiting the repository named by \fB<URL>\fR\&. .SH "OPTIONS" @@ -70,7 +70,7 @@ syntax, to have its local name, a colon .RE .SH "EXAMPLES" .sp -Imagine that you built your work on your \fBmaster\fR branch on top of the \fBv1\&.0\fR release, and want it to be integrated to the project\&. First you push that change to your public repository for others to see: +Imagine that you built your work on your \fBmaster\fR branch on top of the \fBv1\&.0\fR release, and want it to be integrated into the project\&. First you push that change to your public repository for others to see: .sp .if n \{\ .RS 4 diff --git a/man1/git-rerere.1 b/man1/git-rerere.1 index 5cd7174b8..6d8d684d8 100644 --- a/man1/git-rerere.1 +++ b/man1/git-rerere.1 @@ -2,12 +2,12 @@ .\" Title: git-rerere .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-RERERE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-RERERE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reset.1 b/man1/git-reset.1 index 5abbdf3c2..88351ac0f 100644 --- a/man1/git-reset.1 +++ b/man1/git-reset.1 @@ -2,12 +2,12 @@ .\" Title: git-reset .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-RESET" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-RESET" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-restore.1 b/man1/git-restore.1 index 62d12cefb..c0f1c063c 100644 --- a/man1/git-restore.1 +++ b/man1/git-restore.1 @@ -2,12 +2,12 @@ .\" Title: git-restore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-RESTORE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-RESTORE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -154,7 +154,7 @@ is specified\&. Unmerged paths on the working tree are left alone\&. .PP \-\-ignore\-skip\-worktree\-bits .RS 4 -In sparse checkout mode, by default is to only update entries matched by +In sparse checkout mode, the default is to only update entries matched by \fB<pathspec>\fR and sparse patterns in $GIT_DIR/info/sparse\-checkout\&. This option ignores the sparse patterns and unconditionally restores any files in \fB<pathspec>\fR\&. @@ -299,7 +299,7 @@ $ git restore \-\-staged hello\&.c .\} .sp .sp -or you can restore both the index and the working tree (this the same as using \fBgit-checkout\fR(1)) +or you can restore both the index and the working tree (this is the same as using \fBgit-checkout\fR(1)) .sp .if n \{\ .RS 4 diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index c4c561307..d9e454ab7 100644 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.1 @@ -2,12 +2,12 @@ .\" Title: git-rev-list .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REV\-LIST" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -84,7 +84,7 @@ $ git rev\-list A\&.\&.\&.B .\} .sp .sp -\fIrev\-list\fR is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs\&. For this reason, it has a lot of different options that enables it to be used by commands as different as \fIgit bisect\fR and \fIgit repack\fR\&. +\fIrev\-list\fR is an essential Git command, since it provides the ability to build and traverse commit ancestry graphs\&. For this reason, it has a lot of different options that enable it to be used by commands as different as \fIgit bisect\fR and \fIgit repack\fR\&. .SH "OPTIONS" .SS "Commit Limiting" .sp @@ -143,7 +143,7 @@ is in use\&. .PP \-\-grep=<pattern> .RS 4 -Limit the commits output to ones with log message that matches the specified pattern (regular expression)\&. With more than one +Limit the commits output to ones with a log message that matches the specified pattern (regular expression)\&. With more than one \fB\-\-grep=<pattern>\fR, commits whose message matches any of the given patterns are chosen (but see \fB\-\-all\-match\fR)\&. .RE @@ -156,7 +156,7 @@ Limit the commits output to ones that match all given .PP \-\-invert\-grep .RS 4 -Limit the commits output to ones with log message that do not match the pattern specified with +Limit the commits output to ones with a log message that do not match the pattern specified with \fB\-\-grep=<pattern>\fR\&. .RE .PP @@ -1683,7 +1683,7 @@ and we are outputting in .PP \-\-expand\-tabs=<n>, \-\-expand\-tabs, \-\-no\-expand\-tabs .RS 4 -Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of +Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of \fI<n>\fR) in the log message before showing it in the output\&. \fB\-\-expand\-tabs\fR is a short\-hand for diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index a5acf0a83..37f323d82 100644 --- a/man1/git-rev-parse.1 +++ b/man1/git-rev-parse.1 @@ -2,12 +2,12 @@ .\" Title: git-rev-parse .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REV\-PARSE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REV\-PARSE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-rev-parse \- Pick out and massage parameters .sp .SH "DESCRIPTION" .sp -Many Git porcelainish commands take mixture of flags (i\&.e\&. parameters that begin with a dash \fI\-\fR) and parameters meant for the underlying \fIgit rev\-list\fR command they use internally and flags and parameters for the other commands they use downstream of \fIgit rev\-list\fR\&. This command is used to distinguish between them\&. +Many Git porcelainish commands take a mixture of flags (i\&.e\&. parameters that begin with a dash \fI\-\fR) and parameters meant for the underlying \fIgit rev\-list\fR command they use internally and flags and parameters for the other commands they use downstream of \fIgit rev\-list\fR\&. This command is used to distinguish between them\&. .SH "OPTIONS" .SS "Operation Modes" .sp @@ -56,7 +56,7 @@ Use \fIgit rev\-parse\fR in shell quoting mode (see SQ\-QUOTE section below)\&. In contrast to the \fB\-\-sq\fR -option below, this mode does only quoting\&. Nothing else is done to command input\&. +option below, this mode only does quoting\&. Nothing else is done to command input\&. .RE .SS "Options for \-\-parseopt" .PP @@ -216,7 +216,7 @@ prefix); this option makes them output in a form as close to the original input .PP \-\-symbolic\-full\-name .RS 4 -This is similar to \-\-symbolic, but it omits input that are not refs (i\&.e\&. branch or tag names; or more explicitly disambiguating "heads/master" form, when you want to name the "master" branch when there is an unfortunately named tag "master"), and show them as full refnames (e\&.g\&. "refs/heads/master")\&. +This is similar to \-\-symbolic, but it omits input that are not refs (i\&.e\&. branch or tag names; or more explicitly disambiguating "heads/master" form, when you want to name the "master" branch when there is an unfortunately named tag "master"), and shows them as full refnames (e\&.g\&. "refs/heads/master")\&. .RE .SS "Options for Objects" .PP @@ -1199,7 +1199,7 @@ to not make the corresponding negated long option available\&. is terminated by the first whitespace\&. It is customary to use a dash to separate words in a multi\-word argument hint\&. .RE .sp -The remainder of the line, after stripping the spaces, is used as the help associated to the option\&. +The remainder of the line, after stripping the spaces, is used as the help associated with the option\&. .sp Blank lines are ignored, and lines that don\(cqt match this specification are used as option group headers (start the line with a space to create such lines on purpose)\&. .SS "Example" diff --git a/man1/git-revert.1 b/man1/git-revert.1 index e26dfe266..d9f1ec8ba 100644 --- a/man1/git-revert.1 +++ b/man1/git-revert.1 @@ -2,12 +2,12 @@ .\" Title: git-revert .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-REVERT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-REVERT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rm.1 b/man1/git-rm.1 index 768a74336..18f221c99 100644 --- a/man1/git-rm.1 +++ b/man1/git-rm.1 @@ -2,12 +2,12 @@ .\" Title: git-rm .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-RM" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-RM" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -196,7 +196,7 @@ git diff \-\-name\-only \-\-diff\-filter=D \-z | xargs \-0 git rm \-\-cached .sp Only submodules using a gitfile (which means they were cloned with a Git version 1\&.7\&.8 or newer) will be removed from the work tree, as their repository lives inside the \&.git directory of the superproject\&. If a submodule (or one of those nested inside it) still uses a \&.git directory, \fBgit rm\fR will move the submodules git directory into the superprojects git directory to protect the submodule\(cqs history\&. If it exists the submodule\&.<name> section in the \fBgitmodules\fR(5) file will also be removed and that file will be staged (unless \-\-cached or \-n are used)\&. .sp -A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren\(cqt ignored are present in the submodules work tree\&. Ignored files are deemed expendable and won\(cqt stop a submodule\(cqs work tree from being removed\&. +A submodule is considered up to date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked files that aren\(cqt ignored are present in the submodule\(cqs work tree\&. Ignored files are deemed expendable and won\(cqt stop a submodule\(cqs work tree from being removed\&. .sp If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use \fBgit-submodule\fR(1) \fBdeinit\fR instead\&. Also see \fBgitsubmodules\fR(7) for details on submodule removal\&. .SH "EXAMPLES" diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 674d0dc1a..d795f8785 100644 --- a/man1/git-send-email.1 +++ b/man1/git-send-email.1 @@ -2,12 +2,12 @@ .\" Title: git-send-email .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SEND\-EMAIL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -756,7 +756,7 @@ Send emails even if safety checks would prevent it\&. .PP \-\-dump\-aliases .RS 4 -Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order\&. Note, this only includes the alias name and not its expanded email addresses\&. See +Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order\&. Note that this only includes the alias name and not its expanded email addresses\&. See \fIsendemail\&.aliasesfile\fR for more information about aliases\&. .RE @@ -831,7 +831,7 @@ Format of the file(s) specified in sendemail\&.aliasesFile\&. Must be one of \fImutt\fR, \fImailrc\fR, \fIpine\fR, -\fIelm\fR, or +\fIelm\fR, \fIgnus\fR, or \fIsendmail\fR\&. .sp @@ -911,7 +911,7 @@ option of .PP sendemail\&.smtpReloginDelay .RS 4 -Seconds wait before reconnecting to smtp server\&. See also the +Seconds to wait before reconnecting to the smtp server\&. See also the \fB\-\-relogin\-delay\fR option of \fBgit-send-email\fR(1)\&. diff --git a/man1/git-send-pack.1 b/man1/git-send-pack.1 index aeba9f5ee..eed532084 100644 --- a/man1/git-send-pack.1 +++ b/man1/git-send-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-send-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SEND\-PACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SEND\-PACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -79,7 +79,7 @@ Do everything except actually send the updates\&. .PP \-\-force .RS 4 -Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it\&. This flag disables the check\&. What this means is that the remote repository can lose commits; use it with care\&. +Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it\&. This flag disables the check\&. This means that the remote repository can lose commits; use it with care\&. .RE .PP \-\-verbose @@ -142,11 +142,11 @@ The remote refs to update\&. .sp There are three ways to specify which refs to update on the remote end\&. .sp -With \fB\-\-all\fR flag, all refs that exist locally are transferred to the remote side\&. You cannot specify any \fI<ref>\fR if you use this flag\&. +With the \fB\-\-all\fR flag, all refs that exist locally are transferred to the remote side\&. You cannot specify any \fI<ref>\fR if you use this flag\&. .sp Without \fB\-\-all\fR and without any \fI<ref>\fR, the heads that exist both on the local side and on the remote side are updated\&. .sp -When one or more \fI<ref>\fR are specified explicitly (whether on the command line or via \fB\-\-stdin\fR), it can be either a single pattern, or a pair of such pattern separated by a colon ":" (this means that a ref name cannot have a colon in it)\&. A single pattern \fI<name>\fR is just a shorthand for \fI<name>:<name>\fR\&. +When one or more \fI<ref>\fR are specified explicitly (whether on the command line or via \fB\-\-stdin\fR), it can be either a single pattern, or a pair of such patterns separated by a colon ":" (this means that a ref name cannot have a colon in it)\&. A single pattern \fI<name>\fR is just shorthand for \fI<name>:<name>\fR\&. .sp Each pattern pair consists of the source side (before the colon) and the destination side (after the colon)\&. The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side\&. The rules used to match a ref are the same rules used by \fIgit rev\-parse\fR to resolve a symbolic ref name\&. See \fBgit-rev-parse\fR(1)\&. .sp @@ -169,7 +169,7 @@ It is an error if <src> does not match exactly one of the local refs\&. .sp -1 .IP \(bu 2.3 .\} -It is an error if <dst> matches more than one remote refs\&. +It is an error if <dst> matches more than one remote ref\&. .RE .sp .RS 4 @@ -205,7 +205,7 @@ it has to start with "refs/"; <dst> is used as the destination literally in this .RE .RE .sp -Without \(oq\-\-force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i\&.e\&. an ancestor) of <src>\&. This check, known as "fast\-forward check", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples\(cq commits from there\&. +Without \fB\-\-force\fR, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i\&.e\&. an ancestor) of <src>\&. This check, known as the "fast\-forward check", is performed to avoid accidentally overwriting the remote ref and losing other people\(cqs commits from there\&. .sp With \fB\-\-force\fR, the fast\-forward check is disabled for all refs\&. .sp diff --git a/man1/git-sh-i18n--envsubst.1 b/man1/git-sh-i18n--envsubst.1 index 560840799..d8a773500 100644 --- a/man1/git-sh-i18n--envsubst.1 +++ b/man1/git-sh-i18n--envsubst.1 @@ -2,12 +2,12 @@ .\" Title: git-sh-i18n--envsubst .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SH\-I18N\-\-ENVSUBST" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SH\-I18N\-\-ENVSUBST" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n.1 b/man1/git-sh-i18n.1 index 99db1b65c..88d9d5bc5 100644 --- a/man1/git-sh-i18n.1 +++ b/man1/git-sh-i18n.1 @@ -2,12 +2,12 @@ .\" Title: git-sh-i18n .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SH\-I18N" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SH\-I18N" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-setup.1 b/man1/git-sh-setup.1 index 55f7c97ab..b12e662ed 100644 --- a/man1/git-sh-setup.1 +++ b/man1/git-sh-setup.1 @@ -2,12 +2,12 @@ .\" Title: git-sh-setup .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SH\-SETUP" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SH\-SETUP" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -41,7 +41,7 @@ This is not a command the end user would want to run\&. Ever\&. This documentati .sp The \fIgit sh\-setup\fR scriptlet is designed to be sourced (using \fB\&.\fR) by other shell scripts to set up some variables pointing at the normal Git directories and a few helper shell functions\&. .sp -Before sourcing it, your script should set up a few variables; \fBUSAGE\fR (and \fBLONG_USAGE\fR, if any) is used to define message given by \fBusage()\fR shell function\&. \fBSUBDIRECTORY_OK\fR can be set if the script can run from a subdirectory of the working tree (some commands do not)\&. +Before sourcing it, your script should set up a few variables; \fBUSAGE\fR (and \fBLONG_USAGE\fR, if any) is used to define the message given by \fBusage()\fR shell function\&. \fBSUBDIRECTORY_OK\fR can be set if the script can run from a subdirectory of the working tree (some commands do not)\&. .sp The scriptlet sets \fBGIT_DIR\fR and \fBGIT_OBJECT_DIRECTORY\fR shell variables, but does \fBnot\fR export them to the environment\&. .SH "FUNCTIONS" diff --git a/man1/git-shell.1 b/man1/git-shell.1 index 446e9482f..5e219ac9a 100644 --- a/man1/git-shell.1 +++ b/man1/git-shell.1 @@ -2,12 +2,12 @@ .\" Title: git-shell .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SHELL" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SHELL" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index b58237188..af1282504 100644 --- a/man1/git-shortlog.1 +++ b/man1/git-shortlog.1 @@ -2,12 +2,12 @@ .\" Title: git-shortlog .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SHORTLOG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -267,7 +267,7 @@ is in use\&. .PP \-\-grep=<pattern> .RS 4 -Limit the commits output to ones with log message that matches the specified pattern (regular expression)\&. With more than one +Limit the commits output to ones with a log message that matches the specified pattern (regular expression)\&. With more than one \fB\-\-grep=<pattern>\fR, commits whose message matches any of the given patterns are chosen (but see \fB\-\-all\-match\fR)\&. .sp @@ -284,7 +284,7 @@ Limit the commits output to ones that match all given .PP \-\-invert\-grep .RS 4 -Limit the commits output to ones with log message that do not match the pattern specified with +Limit the commits output to ones with a log message that do not match the pattern specified with \fB\-\-grep=<pattern>\fR\&. .RE .PP diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index d179e1662..eeb4107b3 100644 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-show-branch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SHOW\-BRANCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SHOW\-BRANCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -74,7 +74,7 @@ Show both remote\-tracking branches and local branches\&. .PP \-\-current .RS 4 -With this option, the command includes the current branch to the list of revs to be shown when it is not given on the command line\&. +With this option, the command includes the current branch in the list of revs to be shown when it is not given on the command line\&. .RE .PP \-\-topo\-order @@ -154,14 +154,14 @@ Turn off colored output, even when the configuration file gives the default to c \fB\-\-color=never\fR\&. .RE .sp -Note that \-\-more, \-\-list, \-\-independent and \-\-merge\-base options are mutually exclusive\&. +Note that \-\-more, \-\-list, \-\-independent, and \-\-merge\-base options are mutually exclusive\&. .SH "OUTPUT" .sp Given N <ref>s, the first N lines are the one\-line description from their commit message\&. The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk \fB*\fR character while other heads are prefixed with a \fB!\fR character\&. .sp -Following these N lines, one\-line log for each commit is displayed, indented N places\&. If a commit is on the I\-th branch, the I\-th indentation character shows a \fB+\fR sign; otherwise it shows a space\&. Merge commits are denoted by a \fB\-\fR sign\&. Each commit shows a short name that can be used as an extended SHA\-1 to name that commit\&. +Following these N lines, a one\-line log for each commit is displayed, indented N places\&. If a commit is on the I\-th branch, the I\-th indentation character shows a \fB+\fR sign; otherwise it shows a space\&. Merge commits are denoted by a \fB\-\fR sign\&. Each commit shows a short name that can be used as an extended SHA\-1 to name that commit\&. .sp -The following example shows three branches, "master", "fixes" and "mhf": +The following example shows three branches, "master", "fixes", and "mhf": .sp .if n \{\ .RS 4 @@ -173,7 +173,7 @@ $ git show\-branch master fixes mhf ! [mhf] Allow "+remote:local" refspec to cause \-\-force when fetching\&. \-\-\- + [mhf] Allow "+remote:local" refspec to cause \-\-force when fetching\&. - + [mhf~1] Use git\-octopus when pulling more than one heads\&. + + [mhf~1] Use git\-octopus when pulling more than one head\&. + [fixes] Introduce "reset type" flag to "git reset" + [mhf~2] "git fetch \-\-force"\&. + [mhf~3] Use \&.git/remote/origin, not \&.git/branches/origin\&. @@ -220,7 +220,7 @@ $ git show\-branch \-\-reflog="10,1 hour ago" \-\-list master .\} .sp .sp -shows 10 reflog entries going back from the tip as of 1 hour ago\&. Without \fB\-\-list\fR, the output also shows how these tips are topologically related with each other\&. +shows 10 reflog entries going back from the tip as of 1 hour ago\&. Without \fB\-\-list\fR, the output also shows how these tips are topologically related to each other\&. .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: diff --git a/man1/git-show-index.1 b/man1/git-show-index.1 index 23a0c86c6..cf337f9d1 100644 --- a/man1/git-show-index.1 +++ b/man1/git-show-index.1 @@ -2,12 +2,12 @@ .\" Title: git-show-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SHOW\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SHOW\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-ref.1 b/man1/git-show-ref.1 index e1794f694..9dc8d9867 100644 --- a/man1/git-show-ref.1 +++ b/man1/git-show-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-show-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SHOW\-REF" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SHOW\-REF" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -198,7 +198,7 @@ To show all references called "master", whether tags or heads or anything else, .\} .sp .sp -This will show "refs/heads/master" but also "refs/remote/other\-repo/master", if such references exists\&. +This will show "refs/heads/master" but also "refs/remote/other\-repo/master", if such references exist\&. .sp When using the \fB\-\-verify\fR flag, the command requires an exact path: .sp diff --git a/man1/git-show.1 b/man1/git-show.1 index 8d7a17525..508694dad 100644 --- a/man1/git-show.1 +++ b/man1/git-show.1 @@ -2,12 +2,12 @@ .\" Title: git-show .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SHOW" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SHOW" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -121,7 +121,7 @@ and we are outputting in .PP \-\-expand\-tabs=<n>, \-\-expand\-tabs, \-\-no\-expand\-tabs .RS 4 -Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of +Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is a multiple of \fI<n>\fR) in the log message before showing it in the output\&. \fB\-\-expand\-tabs\fR is a short\-hand for @@ -166,7 +166,7 @@ argument, use the ref to find the notes to display\&. The ref can specify the fu \fBrefs/\fR and otherwise \fBrefs/notes/\fR -is prefixed to form a full name of the ref\&. +is prefixed to form the full name of the ref\&. .sp Multiple \-\-notes options can be combined to control which notes are being displayed\&. Examples: "\-\-notes=foo" will show only notes from "refs/notes/foo"; "\-\-notes=foo \-\-notes" will show both notes from "refs/notes/foo" and from the default notes ref(s)\&. .RE @@ -1317,7 +1317,47 @@ that show the patch by default to squelch their output, or to cancel the effect earlier on the command line in an alias\&. .RE .PP -\-\-diff\-merges=(off|none|on|first\-parent|1|separate|m|combined|c|dense\-combined|cc|remerge|r), \-\-no\-diff\-merges +\-m +.RS 4 +Show diffs for merge commits in the default format\&. This is similar to +\fI\-\-diff\-merges=on\fR, except +\fB\-m\fR +will produce no output unless +\fB\-p\fR +is given as well\&. +.RE +.PP +\-c +.RS 4 +Produce combined diff output for merge commits\&. Shortcut for +\fI\-\-diff\-merges=combined \-p\fR\&. +.RE +.PP +\-\-cc +.RS 4 +Produce dense combined diff output for merge commits\&. Shortcut for +\fI\-\-diff\-merges=dense\-combined \-p\fR\&. +.RE +.PP +\-\-dd +.RS 4 +Produce diff with respect to first parent for both merge and regular commits\&. Shortcut for +\fI\-\-diff\-merges=first\-parent \-p\fR\&. +.RE +.PP +\-\-remerge\-diff +.RS 4 +Produce remerge\-diff output for merge commits\&. Shortcut for +\fI\-\-diff\-merges=remerge \-p\fR\&. +.RE +.PP +\-\-no\-diff\-merges +.RS 4 +Synonym for +\fI\-\-diff\-merges=off\fR\&. +.RE +.PP +\-\-diff\-merges=<format> .RS 4 Specify diff format to be used for merge commits\&. Default is \fBdense\-combined\fR @@ -1326,57 +1366,51 @@ unless is in use, in which case \fBfirst\-parent\fR is the default\&. +.sp +The following formats are supported: .PP -\-\-diff\-merges=(off|none), \-\-no\-diff\-merges +off, none .RS 4 Disable output of diffs for merge commits\&. Useful to override implied value\&. .RE .PP -\-\-diff\-merges=on, \-\-diff\-merges=m, \-m +on, m .RS 4 -This option makes diff output for merge commits to be shown in the default format\&. -\fB\-m\fR -will produce the output only if -\fB\-p\fR -is given as well\&. The default format could be changed using +Make diff output for merge commits to be shown in the default format\&. The default format could be changed using \fBlog\&.diffMerges\fR -configuration parameter, which default value is +configuration variable, whose default value is \fBseparate\fR\&. .RE .PP -\-\-diff\-merges=first\-parent, \-\-diff\-merges=1 +first\-parent, 1 .RS 4 -This option makes merge commits show the full diff with respect to the first parent only\&. +Show full diff with respect to first parent\&. This is the same format as +\fB\-\-patch\fR +produces for non\-merge commits\&. .RE .PP -\-\-diff\-merges=separate +separate .RS 4 -This makes merge commits show the full diff with respect to each of the parents\&. Separate log entry and diff is generated for each parent\&. +Show full diff with respect to each of parents\&. Separate log entry and diff is generated for each parent\&. .RE .PP -\-\-diff\-merges=remerge, \-\-diff\-merges=r, \-\-remerge\-diff +combined, c .RS 4 -With this option, two\-parent merge commits are remerged to create a temporary tree object \(em potentially containing files with conflict markers and such\&. A diff is then shown between that temporary tree and the actual merge commit\&. -.sp -The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)\&. +Show differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time\&. Furthermore, it lists only files which were modified from all parents\&. .RE .PP -\-\-diff\-merges=combined, \-\-diff\-merges=c, \-c +dense\-combined, cc .RS 4 -With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time\&. Furthermore, it lists only files which were modified from all parents\&. -\fB\-c\fR -implies -\fB\-p\fR\&. +Further compress output produced by +\fB\-\-diff\-merges=combined\fR +by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&. .RE .PP -\-\-diff\-merges=dense\-combined, \-\-diff\-merges=cc, \-\-cc +remerge, r .RS 4 -With this option the output produced by -\fB\-\-diff\-merges=combined\fR -is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification\&. -\fB\-\-cc\fR -implies -\fB\-p\fR\&. +Remerge two\-parent merge commits to create a temporary tree object\(empotentially containing files with conflict markers and such\&. A diff is then shown between that temporary tree and the actual merge commit\&. +.sp +The output emitted when this option is used is subject to change, and so is its interaction with other options (unless explicitly documented)\&. .RE .RE .PP @@ -2136,7 +2170,7 @@ Patterns have the same syntax and semantics as patterns used for fnmatch(3) with .RS 4 Discard the files before the named <file> from the output (i\&.e\&. \fIskip to\fR), or move them to the end of the output (i\&.e\&. -\fIrotate to\fR)\&. These were invented primarily for use of the +\fIrotate to\fR)\&. These options were invented primarily for the use of the \fBgit difftool\fR command, and may not be very useful otherwise\&. .RE @@ -2290,7 +2324,7 @@ What the \-p option produces is slightly different from the traditional diff for .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header that looks like this: +It is preceded by a "git diff" header that looks like this: .sp .if n \{\ .RS 4 @@ -2316,11 +2350,11 @@ or \fBb/\fR filenames\&. .sp -When rename/copy is involved, +When a rename/copy is involved, \fBfile1\fR and \fBfile2\fR -show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&. +show the name of the source file of the rename/copy and the name of the file that the rename/copy produces, respectively\&. .RE .sp .RS 4 @@ -2420,11 +2454,11 @@ rename to a .\} Hunk headers mention the name of the function to which the hunk applies\&. See "Defining a custom hunk\-header" in \fBgitattributes\fR(5) -for details of how to tailor to this to specific languages\&. +for details of how to tailor this to specific languages\&. .RE .SH "COMBINED DIFF FORMAT" .sp -Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in specific format\&. +Any diff\-generating command can take the \fB\-c\fR or \fB\-\-cc\fR option to produce a \fIcombined diff\fR when showing a merge\&. This is the default format when showing merges with \fBgit-diff\fR(1) or \fBgit-show\fR(1)\&. Note also that you can give suitable \fB\-\-diff\-merges\fR option to any of these commands to force generation of diffs in a specific format\&. .sp A "combined diff" format looks like this: .sp @@ -2474,7 +2508,7 @@ index fabadb8,cc95eb0\&.\&.4866510 .sp -1 .IP " 1." 4.2 .\} -It is preceded with a "git diff" header, that looks like this (when the +It is preceded by a "git diff" header, that looks like this (when the \fB\-c\fR option is used): .sp @@ -2528,7 +2562,7 @@ deleted file mode <mode>,<mode> .sp The \fBmode <mode>,<mode>\&.\&.<mode>\fR -line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree\-ish> and are not used by combined diff format\&. +line appears only if at least one of the <mode> is different from the rest\&. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two <tree\-ish> and are not used by combined diff format\&. .RE .sp .RS 4 @@ -2539,7 +2573,7 @@ line appears only if at least one of the <mode> is different from the rest\&. Ex .sp -1 .IP " 3." 4.2 .\} -It is followed by two\-line from\-file/to\-file header +It is followed by a two\-line from\-file/to\-file header: .sp .if n \{\ .RS 4 @@ -2552,13 +2586,13 @@ It is followed by two\-line from\-file/to\-file header .RE .\} .sp -Similar to two\-line header for traditional +Similar to the two\-line header for the traditional \fIunified\fR diff format, \fB/dev/null\fR is used to signal created or deleted files\&. .sp -However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file you get a N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit +However, if the \-\-combined\-all\-paths option is provided, instead of a two\-line from\-file/to\-file, you get an N+1 line from\-file/to\-file header, where N is the number of parents in the merge commit: .sp .if n \{\ .RS 4 @@ -2608,7 +2642,7 @@ Unlike the traditional \fIunified\fR diff format, which shows two files A and B .sp A \fB\-\fR character in the column N means that the line appears in fileN but it does not appear in the result\&. A \fB+\fR character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)\&. .sp -In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. +In the above example output, the function signature was changed from both files (hence two \fB\-\fR removals from both file1 and file2, plus \fB++\fR to mean one line that was added does not appear in either file1 or file2)\&. Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with \fB+\fR)\&. .sp When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by \fBgit diff\-files \-c\fR, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&. .SH "EXAMPLES" @@ -2616,7 +2650,7 @@ When shown by \fBgit diff\-tree \-c\fR, it compares the parents of a merge commi \fBgit show v1\&.0\&.0\fR .RS 4 Shows the tag -\fBv1\&.0\&.0\fR, along with the object the tags points at\&. +\fBv1\&.0\&.0\fR, along with the object the tag points at\&. .RE .PP \fBgit show v1\&.0\&.0^{tree}\fR @@ -2704,7 +2738,7 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t \fIgit commit\fR and \fIgit commit\-tree\fR -issues a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have +issue a warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding\&. The way to say this is to have \fBi18n\&.commitEncoding\fR in \fB\&.git/config\fR @@ -2723,7 +2757,7 @@ file, like this: .sp Commit objects created with the above setting record the value of \fBi18n\&.commitEncoding\fR -in its +in their \fBencoding\fR header\&. This is to help other people who look at them later\&. Lack of this header implies that the commit log message is encoded in UTF\-8\&. .RE diff --git a/man1/git-sparse-checkout.1 b/man1/git-sparse-checkout.1 index b83a6c364..10638b88f 100644 --- a/man1/git-sparse-checkout.1 +++ b/man1/git-sparse-checkout.1 @@ -2,12 +2,12 @@ .\" Title: git-sparse-checkout .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SPARSE\-CHECKOUT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SPARSE\-CHECKOUT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stage.1 b/man1/git-stage.1 index e708d70dd..5ada1bf44 100644 --- a/man1/git-stage.1 +++ b/man1/git-stage.1 @@ -2,12 +2,12 @@ .\" Title: git-stage .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-STAGE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-STAGE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stash.1 b/man1/git-stash.1 index 111a2733c..2fb4c5b4f 100644 --- a/man1/git-stash.1 +++ b/man1/git-stash.1 @@ -2,12 +2,12 @@ .\" Title: git-stash .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-STASH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-STASH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -538,7 +538,7 @@ stash\&.showIncludeUntracked .RS 4 If this is set to true, the \fBgit stash show\fR -command will show the untracked files of a stash entry\&. Defaults to false\&. See description of +command will show the untracked files of a stash entry\&. Defaults to false\&. See the description of the \fIshow\fR command in \fBgit-stash\fR(1)\&. @@ -548,7 +548,7 @@ stash\&.showPatch .RS 4 If this is set to true, the \fBgit stash show\fR -command without an option will show the stash entry in patch form\&. Defaults to false\&. See description of +command without an option will show the stash entry in patch form\&. Defaults to false\&. See the description of the \fIshow\fR command in \fBgit-stash\fR(1)\&. @@ -558,7 +558,7 @@ stash\&.showStat .RS 4 If this is set to true, the \fBgit stash show\fR -command without an option will show diffstat of the stash entry\&. Defaults to true\&. See description of +command without an option will show a diffstat of the stash entry\&. Defaults to true\&. See the description of the \fIshow\fR command in \fBgit-stash\fR(1)\&. diff --git a/man1/git-status.1 b/man1/git-status.1 index a45a53daa..38cd5a539 100644 --- a/man1/git-status.1 +++ b/man1/git-status.1 @@ -2,12 +2,12 @@ .\" Title: git-status .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-STATUS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-STATUS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -501,7 +501,7 @@ Submodules have more state and instead report = the submodule has untracked files .RE .sp -since modified content or untracked files in a submodule cannot be added via \fBgit add\fR in the superproject to prepare a commit\&. +This is since modified content or untracked files in a submodule cannot be added via \fBgit add\fR in the superproject to prepare a commit\&. .sp \fIm\fR and \fI?\fR are applied recursively\&. For example if a nested submodule in a submodule contains an untracked file, this is reported as \fI?\fR as well\&. .sp diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1 index de2fdb100..209da09db 100644 --- a/man1/git-stripspace.1 +++ b/man1/git-stripspace.1 @@ -2,12 +2,12 @@ .\" Title: git-stripspace .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-STRIPSPACE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-STRIPSPACE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -90,18 +90,18 @@ to the last line if necessary\&. .sp In the case where the input consists entirely of whitespace characters, no output will be produced\&. .sp -\fBNOTE\fR: This is intended for cleaning metadata, prefer the \fB\-\-whitespace=fix\fR mode of \fBgit-apply\fR(1) for correcting whitespace of patches or files in the repository\&. +\fBNOTE\fR: This is intended for cleaning metadata\&. Prefer the \fB\-\-whitespace=fix\fR mode of \fBgit-apply\fR(1) for correcting whitespace of patches or files in the repository\&. .SH "OPTIONS" .PP \-s, \-\-strip\-comments .RS 4 -Skip and remove all lines starting with comment character (default +Skip and remove all lines starting with a comment character (default \fI#\fR)\&. .RE .PP \-c, \-\-comment\-lines .RS 4 -Prepend comment character and blank to each line\&. Lines will automatically be terminated with a newline\&. On empty lines, only the comment character will be prepended\&. +Prepend the comment character and a blank space to each line\&. Lines will automatically be terminated with a newline\&. On empty lines, only the comment character will be prepended\&. .RE .SH "EXAMPLES" .sp diff --git a/man1/git-submodule.1 b/man1/git-submodule.1 index 4c969c907..4f422ebe5 100644 --- a/man1/git-submodule.1 +++ b/man1/git-submodule.1 @@ -2,12 +2,12 @@ .\" Title: git-submodule .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SUBMODULE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SUBMODULE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-svn.1 b/man1/git-svn.1 index c00106ea4..e678b2d6f 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -2,12 +2,12 @@ .\" Title: git-svn .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SVN" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SVN" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-switch.1 b/man1/git-switch.1 index 1cc773df8..7cd64bf7b 100644 --- a/man1/git-switch.1 +++ b/man1/git-switch.1 @@ -2,12 +2,12 @@ .\" Title: git-switch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SWITCH" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SWITCH" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -459,12 +459,12 @@ The number of parallel workers to use when updating the working tree\&. The defa \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\&. +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\&. +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 you to define the minimum number of files for which parallel checkout should be attempted\&. The default is 100\&. .RE .SH "SEE ALSO" .sp diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index a8ed10eaa..86f351ff0 100644 --- a/man1/git-symbolic-ref.1 +++ b/man1/git-symbolic-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-symbolic-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-SYMBOLIC\-REF" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-SYMBOLIC\-REF" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -45,7 +45,7 @@ Given two arguments, creates or updates a symbolic ref <name> to point at the gi .sp Given \fB\-\-delete\fR and an additional argument, deletes the given symbolic ref\&. .sp -A symbolic ref is a regular file that stores a string that begins with \fBref: refs/\fR\&. For example, your \fB\&.git/HEAD\fR is a regular file whose contents is \fBref: refs/heads/master\fR\&. +A symbolic ref is a regular file that stores a string that begins with \fBref: refs/\fR\&. For example, your \fB\&.git/HEAD\fR is a regular file whose content is \fBref: refs/heads/master\fR\&. .SH "OPTIONS" .PP \-d, \-\-delete diff --git a/man1/git-tag.1 b/man1/git-tag.1 index 69edc85e4..6caa9d9e1 100644 --- a/man1/git-tag.1 +++ b/man1/git-tag.1 @@ -2,12 +2,12 @@ .\" Title: git-tag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-TAG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-TAG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-file.1 b/man1/git-unpack-file.1 index 06af37c7f..3e4614c05 100644 --- a/man1/git-unpack-file.1 +++ b/man1/git-unpack-file.1 @@ -2,12 +2,12 @@ .\" Title: git-unpack-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UNPACK\-FILE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UNPACK\-FILE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1 index 4d416eed3..8909ed823 100644 --- a/man1/git-unpack-objects.1 +++ b/man1/git-unpack-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-unpack-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UNPACK\-OBJECTS" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UNPACK\-OBJECTS" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 33c009e9f..13d91f8dd 100644 --- a/man1/git-update-index.1 +++ b/man1/git-update-index.1 @@ -2,12 +2,12 @@ .\" Title: git-update-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -68,7 +68,7 @@ If a specified file isn\(cqt in the index already then it\(cqs added\&. Default .PP \-\-remove .RS 4 -If a specified file is in the index but is missing then it\(cqs removed\&. Default behavior is to ignore removed file\&. +If a specified file is in the index but is missing then it\(cqs removed\&. Default behavior is to ignore removed files\&. .RE .PP \-\-refresh @@ -117,7 +117,7 @@ Set the execute permissions on the updated files\&. .PP \-\-[no\-]assume\-unchanged .RS 4 -When this flag is specified, the object names recorded for the paths are not updated\&. Instead, this option sets/unsets the "assume unchanged" bit for the paths\&. When the "assume unchanged" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index\&. If you want to change the working tree file, you need to unset the bit to tell Git\&. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e\&.g\&. cifs)\&. +When this flag is specified, the object names recorded for the paths are not updated\&. Instead, this option sets/unsets the "assume unchanged" bit for the paths\&. When the "assume unchanged" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index\&. If you want to change the working tree file, you need to unset the bit to tell Git\&. This is sometimes helpful when working with a big project on a filesystem that has a very slow lstat(2) system call (e\&.g\&. cifs)\&. .sp Git will fail (gracefully) in case it needs to modify this file in the index e\&.g\&. when merging in a commit; thus, in case the assumed\-untracked file is changed upstream, you will need to handle the situation manually\&. .RE @@ -130,7 +130,7 @@ Like .PP \-\-[no\-]skip\-worktree .RS 4 -When one of these flags is specified, the object name recorded for the paths are not updated\&. Instead, these options set and unset the "skip\-worktree" bit for the paths\&. See section "Skip\-worktree bit" below for more information\&. +When one of these flags is specified, the object names recorded for the paths are not updated\&. Instead, these options set and unset the "skip\-worktree" bit for the paths\&. See section "Skip\-worktree bit" below for more information\&. .RE .PP \-\-[no\-]ignore\-skip\-worktree\-entries @@ -142,14 +142,14 @@ option was specified\&. .PP \-\-[no\-]fsmonitor\-valid .RS 4 -When one of these flags is specified, the object name recorded for the paths are not updated\&. Instead, these options set and unset the "fsmonitor valid" bit for the paths\&. See section "File System Monitor" below for more information\&. +When one of these flags is specified, the object names recorded for the paths are not updated\&. Instead, these options set and unset the "fsmonitor valid" bit for the paths\&. See section "File System Monitor" below for more information\&. .RE .PP \-g, \-\-again .RS 4 Runs \fIgit update\-index\fR -itself on the paths whose index entries are different from those from the +itself on the paths whose index entries are different from those of the \fBHEAD\fR commit\&. .RE @@ -189,17 +189,17 @@ cannot be added\&. With \-\-replace flag, existing entries that conflict with th .PP \-\-stdin .RS 4 -Instead of taking list of paths from the command line, read list of paths from the standard input\&. Paths are separated by LF (i\&.e\&. one path per line) by default\&. +Instead of taking a list of paths from the command line, read a list of paths from the standard input\&. Paths are separated by LF (i\&.e\&. one path per line) by default\&. .RE .PP \-\-verbose .RS 4 -Report what is being added and removed from index\&. +Report what is being added and removed from the index\&. .RE .PP \-\-index\-version <n> .RS 4 -Write the resulting index out in the named on\-disk format version\&. Supported versions are 2, 3 and 4\&. The current default version is 2 or 3, depending on whether extra features are used, such as +Write the resulting index out in the named on\-disk format version\&. Supported versions are 2, 3, and 4\&. The current default version is 2 or 3, depending on whether extra features are used, such as \fBgit add \-N\fR\&. With \fB\-\-verbose\fR, also report the version the index file uses before and after this command\&. .sp diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1 index 2e3d17dab..f2ea18c73 100644 --- a/man1/git-update-ref.1 +++ b/man1/git-update-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-update-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UPDATE\-REF" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UPDATE\-REF" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -145,7 +145,7 @@ Verify <ref> against <oldvalue> but do not change it\&. If <oldvalue> is zero or .PP option .RS 4 -Modify behavior of the next command naming a <ref>\&. The only valid option is +Modify the behavior of the next command naming a <ref>\&. The only valid option is \fBno\-deref\fR to avoid dereferencing a symbolic ref\&. .RE diff --git a/man1/git-update-server-info.1 b/man1/git-update-server-info.1 index f44e98864..e0582edf5 100644 --- a/man1/git-update-server-info.1 +++ b/man1/git-update-server-info.1 @@ -2,12 +2,12 @@ .\" Title: git-update-server-info .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UPDATE\-SERVER\-INFO" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UPDATE\-SERVER\-INFO" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,11 +42,11 @@ A dumb server that does not do on\-the\-fly pack generations must have some auxi .PP \-f, \-\-force .RS 4 -update the info files from scratch\&. +Update the info files from scratch\&. .RE .SH "OUTPUT" .sp -Currently the command updates the following files\&. Please see \fBgitrepository-layout\fR(5) for description of what they are for: +Currently the command updates the following files\&. Please see \fBgitrepository-layout\fR(5) for a description of what they are for: .sp .RS 4 .ie n \{\ diff --git a/man1/git-upload-archive.1 b/man1/git-upload-archive.1 index b9b4c8616..69290ec20 100644 --- a/man1/git-upload-archive.1 +++ b/man1/git-upload-archive.1 @@ -2,12 +2,12 @@ .\" Title: git-upload-archive .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UPLOAD\-ARCHIVE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UPLOAD\-ARCHIVE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1 index 79ebc16f1..9d9282a86 100644 --- a/man1/git-upload-pack.1 +++ b/man1/git-upload-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-upload-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UPLOAD\-PACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UPLOAD\-PACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -45,7 +45,7 @@ This command is usually not invoked directly by the end user\&. The UI for the p .PP \-\-[no\-]strict .RS 4 -Do not try <directory>/\&.git/ if <directory> is no Git directory\&. +Do not try <directory>/\&.git/ if <directory> is not a Git directory\&. .RE .PP \-\-timeout=<n> diff --git a/man1/git-var.1 b/man1/git-var.1 index 773fe6ef0..f8401cd07 100644 --- a/man1/git-var.1 +++ b/man1/git-var.1 @@ -2,12 +2,12 @@ .\" Title: git-var .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-VAR" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-VAR" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ Prints a Git logical variable\&. Exits with code 1 if the variable has no value\ .PP \-l .RS 4 -Cause the logical variables to be listed\&. In addition, all the variables of the Git configuration file \&.git/config are listed as well\&. (However, the configuration variables listing functionality is deprecated in favor of +Display the logical variables\&. In addition, all the variables of the Git configuration file \&.git/config are listed as well\&. (However, the configuration variables listing functionality is deprecated in favor of \fBgit config \-l\fR\&.) .RE .SH "EXAMPLES" diff --git a/man1/git-verify-commit.1 b/man1/git-verify-commit.1 index f19960b59..843974b88 100644 --- a/man1/git-verify-commit.1 +++ b/man1/git-verify-commit.1 @@ -2,12 +2,12 @@ .\" Title: git-verify-commit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-VERIFY\-COMMIT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-VERIFY\-COMMIT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1 index 41eeac794..01478d9ef 100644 --- a/man1/git-verify-pack.1 +++ b/man1/git-verify-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-verify-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-VERIFY\-PACK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-VERIFY\-PACK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-verify-pack \- Validate packed Git archive files .sp .SH "DESCRIPTION" .sp -Reads given idx file for packed Git archive created with the \fIgit pack\-objects\fR command and verifies idx file and the corresponding pack file\&. +Reads given idx file for packed Git archive created with the \fIgit pack\-objects\fR command and verifies the idx file and the corresponding pack file\&. .SH "OPTIONS" .PP <pack>\&.idx \&... @@ -47,13 +47,13 @@ The idx files to verify\&. .PP \-v, \-\-verbose .RS 4 -After verifying the pack, show list of objects contained in the pack and a histogram of delta chain length\&. +After verifying the pack, show the list of objects contained in the pack and a histogram of delta chain length\&. .RE .PP \-s, \-\-stat\-only .RS 4 Do not verify the pack contents; only show the histogram of delta chain length\&. With -\fB\-\-verbose\fR, list of objects is also shown\&. +\fB\-\-verbose\fR, the list of objects is also shown\&. .RE .PP \-\- diff --git a/man1/git-verify-tag.1 b/man1/git-verify-tag.1 index 660f4cf91..5ddb8fafd 100644 --- a/man1/git-verify-tag.1 +++ b/man1/git-verify-tag.1 @@ -2,12 +2,12 @@ .\" Title: git-verify-tag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-VERIFY\-TAG" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-VERIFY\-TAG" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-version.1 b/man1/git-version.1 index c36f3ea7b..6150b1613 100644 --- a/man1/git-version.1 +++ b/man1/git-version.1 @@ -2,12 +2,12 @@ .\" Title: git-version .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-VERSION" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-VERSION" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-web--browse.1 b/man1/git-web--browse.1 index 52d1ad2e7..1936c8a75 100644 --- a/man1/git-web--browse.1 +++ b/man1/git-web--browse.1 @@ -2,12 +2,12 @@ .\" Title: git-web--browse .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-WEB\-\-BROWSE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-WEB\-\-BROWSE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1 index 3fca25136..1b46fc1f2 100644 --- a/man1/git-whatchanged.1 +++ b/man1/git-whatchanged.1 @@ -2,12 +2,12 @@ .\" Title: git-whatchanged .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-WHATCHANGED" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-WHATCHANGED" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -28,7 +28,7 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -git-whatchanged \- Show logs with difference each commit introduces +git-whatchanged \- Show logs with differences each commit introduces .SH "SYNOPSIS" .sp .nf @@ -39,9 +39,9 @@ git-whatchanged \- Show logs with difference each commit introduces .sp Shows commit logs and diff output each commit introduces\&. .sp -New users are encouraged to use \fBgit-log\fR(1) instead\&. The \fBwhatchanged\fR command is essentially the same as \fBgit-log\fR(1) but defaults to show the raw format diff output and to skip merges\&. +New users are encouraged to use \fBgit-log\fR(1) instead\&. The \fBwhatchanged\fR command is essentially the same as \fBgit-log\fR(1) but defaults to showing the raw format diff output and skipping merges\&. .sp -The command is kept primarily for historical reasons; fingers of many people who learned Git long before \fBgit log\fR was invented by reading Linux kernel mailing list are trained to type it\&. +The command is primarily kept for historical reasons; fingers of many people who learned Git long before \fBgit log\fR was invented by reading the Linux kernel mailing list are trained to type it\&. .SH "EXAMPLES" .PP \fBgit whatchanged \-p v2\&.6\&.12\&.\&. include/scsi drivers/scsi\fR diff --git a/man1/git-worktree.1 b/man1/git-worktree.1 index eb36c2f40..d67133573 100644 --- a/man1/git-worktree.1 +++ b/man1/git-worktree.1 @@ -2,12 +2,12 @@ .\" Title: git-worktree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-WORKTREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-WORKTREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1 index 7088c5f0c..af333fad5 100644 --- a/man1/git-write-tree.1 +++ b/man1/git-write-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-write-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-WRITE\-TREE" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-WRITE\-TREE" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git.1 b/man1/git.1 index ef2419a0e..b06393c6e 100644 --- a/man1/git.1 +++ b/man1/git.1 @@ -2,12 +2,12 @@ .\" Title: git .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -671,7 +671,7 @@ Display version information about Git\&. .PP \fBgit-whatchanged\fR(1) .RS 4 -Show logs with difference each commit introduces\&. +Show logs with differences each commit introduces\&. .RE .PP \fBgitweb\fR(1) diff --git a/man1/gitk.1 b/man1/gitk.1 index 8dee7d52d..0d23a6a59 100644 --- a/man1/gitk.1 +++ b/man1/gitk.1 @@ -2,12 +2,12 @@ .\" Title: gitk .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITK" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITK" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitweb.1 b/man1/gitweb.1 index 9c84b8d06..e8a552c8f 100644 --- a/man1/gitweb.1 +++ b/man1/gitweb.1 @@ -2,12 +2,12 @@ .\" Title: gitweb .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITWEB" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITWEB" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ gitweb \- Git web interface (web frontend to Git repositories) .SH "SYNOPSIS" .sp -To get started with gitweb, run \fBgit-instaweb\fR(1) from a Git repository\&. This would configure and start your web server, and run web browser pointing to gitweb\&. +To get started with gitweb, run \fBgit-instaweb\fR(1) from a Git repository\&. This will configure and start your web server, and run a web browser pointing to gitweb\&. .SH "DESCRIPTION" .sp Gitweb provides a web interface to Git repositories\&. Its features include: @@ -77,7 +77,7 @@ Viewing the contents of files in the repository at any revision\&. .sp -1 .IP \(bu 2.3 .\} -Viewing the revision log of branches, history of files and directories, see what was changed when, by who\&. +Viewing the revision log of branches, history of files and directories, seeing what was changed, when, and by whom\&. .RE .sp .RS 4 @@ -110,7 +110,7 @@ Generating RSS and Atom feeds of commits, for any branch\&. The feeds are auto\- .sp -1 .IP \(bu 2.3 .\} -Viewing everything that was changed in a revision, and step through revisions one at a time, viewing the history of the repository\&. +Viewing everything that was changed in a revision, and stepping through revisions one at a time, viewing the history of the repository\&. .RE .sp .RS 4 @@ -121,7 +121,7 @@ Viewing everything that was changed in a revision, and step through revisions on .sp -1 .IP \(bu 2.3 .\} -Finding commits which commit messages matches given search term\&. +Finding commits whose commit messages match a given search term\&. .RE .sp See \m[blue]\fBhttp://repo\&.or\&.cz/w/git\&.git/tree/HEAD:/gitweb/\fR\m[] for gitweb source code, browsed using gitweb itself\&. @@ -130,7 +130,7 @@ See \m[blue]\fBhttp://repo\&.or\&.cz/w/git\&.git/tree/HEAD:/gitweb/\fR\m[] for g Various aspects of gitweb\(cqs behavior can be controlled through the configuration file \fBgitweb_config\&.perl\fR or \fB/etc/gitweb\&.conf\fR\&. See the \fBgitweb.conf\fR(5) for details\&. .SS "Repositories" .sp -Gitweb can show information from one or more Git repositories\&. These repositories have to be all on local filesystem, and have to share common repository root, i\&.e\&. be all under a single parent repository (but see also "Advanced web server setup" section, "Webserver configuration with multiple projects\*(Aq root" subsection)\&. +Gitweb can show information from one or more Git repositories\&. These repositories have to be all on local filesystem, and have to share a common repository root, i\&.e\&. be all under a single parent repository (but see also the "Advanced web server setup" section, "Webserver configuration with multiple projects\*(Aq root" subsection)\&. .sp .if n \{\ .RS 4 @@ -143,14 +143,14 @@ our $projectroot = \*(Aq/path/to/parent/directory\*(Aq; .\} .sp .sp -The default value for \fB$projectroot\fR is \fB/pub/git\fR\&. You can change it during building gitweb via \fBGITWEB_PROJECTROOT\fR build configuration variable\&. +The default value for \fB$projectroot\fR is \fB/pub/git\fR\&. You can change it during building gitweb via the \fBGITWEB_PROJECTROOT\fR build configuration variable\&. .sp By default all Git repositories under \fB$projectroot\fR are visible and available to gitweb\&. The list of projects is generated by default by scanning the \fB$projectroot\fR directory for Git repositories (for object databases to be more exact; gitweb is not interested in a working area, and is best suited to showing "bare" repositories)\&. .sp The name of the repository in gitweb is the path to its \fB$GIT_DIR\fR (its object database) relative to \fB$projectroot\fR\&. Therefore the repository $repo can be found at "$projectroot/$repo"\&. .SS "Projects list file format" .sp -Instead of having gitweb find repositories by scanning filesystem starting from $projectroot, you can provide a pre\-generated list of visible projects by setting \fB$projects_list\fR to point to a plain text file with a list of projects (with some additional info)\&. +Instead of having gitweb find repositories by scanning the filesystem starting from $projectroot, you can provide a pre\-generated list of visible projects by setting \fB$projects_list\fR to point to a plain text file with a list of projects (with some additional info)\&. .sp This file uses the following format: .sp diff --git a/man1/scalar.1 b/man1/scalar.1 index 9866c3689..2cbc33243 100644 --- a/man1/scalar.1 +++ b/man1/scalar.1 @@ -2,12 +2,12 @@ .\" Title: scalar .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "SCALAR" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "SCALAR" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index 873e26bcf..ebb988937 100644 --- a/man5/gitattributes.5 +++ b/man5/gitattributes.5 @@ -2,12 +2,12 @@ .\" Title: gitattributes .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITATTRIBUTES" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-bundle.5 b/man5/gitformat-bundle.5 index 5a420f302..0b47fd01c 100644 --- a/man5/gitformat-bundle.5 +++ b/man5/gitformat-bundle.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-bundle .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFORMAT\-BUNDLE" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFORMAT\-BUNDLE" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -110,7 +110,7 @@ A Git bundle consists of several parts\&. .sp -1 .IP \(bu 2.3 .\} -"Prerequisites" lists the objects that are NOT included in the bundle and the reader of the bundle MUST already have, in order to use the data in the bundle\&. The objects stored in the bundle may refer to prerequisite objects and anything reachable from them (e\&.g\&. a tree object in the bundle can reference a blob that is reachable from a prerequisite) and/or expressed as a delta against prerequisite objects\&. +"Prerequisites" list the objects that are NOT included in the bundle and the reader of the bundle MUST already have, in order to use the data in the bundle\&. The objects stored in the bundle may refer to prerequisite objects and anything reachable from them (e\&.g\&. a tree object in the bundle can reference a blob that is reachable from a prerequisite) and/or expressed as a delta against prerequisite objects\&. .RE .sp .RS 4 @@ -136,9 +136,9 @@ A Git bundle consists of several parts\&. .RE .sp In the bundle format, there can be a comment following a prerequisite obj\-id\&. This is a comment and it has no specific meaning\&. The writer of the bundle MAY put any string here\&. The reader of the bundle MUST ignore the comment\&. -.SS "Note on the shallow clone and a Git bundle" +.SS "Note on shallow clones and Git bundles" .sp -Note that the prerequisites does not represent a shallow\-clone boundary\&. The semantics of the prerequisites and the shallow\-clone boundaries are different, and the Git bundle v2 format cannot represent a shallow clone repository\&. +Note that the prerequisites do not represent a shallow\-clone boundary\&. The semantics of the prerequisites and the shallow\-clone boundaries are different, and the Git bundle v2 format cannot represent a shallow clone repository\&. .SH "CAPABILITIES" .sp Because there is no opportunity for negotiation, unknown capabilities cause \fIgit bundle\fR to abort\&. diff --git a/man5/gitformat-chunk.5 b/man5/gitformat-chunk.5 index cf3854494..406a25181 100644 --- a/man5/gitformat-chunk.5 +++ b/man5/gitformat-chunk.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-chunk .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFORMAT\-CHUNK" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFORMAT\-CHUNK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -57,7 +57,7 @@ The chunk\-based region starts with a table of contents describing where each ch .sp Each row consists of a 4\-byte chunk identifier (ID) and an 8\-byte offset\&. Each integer is stored in network\-byte order\&. .sp -The chunk identifier \fBID[i]\fR is a label for the data stored within this fill from \fBOFFSET[i]\fR (inclusive) to \fBOFFSET[i+1]\fR (exclusive)\&. Thus, the size of the \fBi`th chunk is equal to the difference between `OFFSET[i+1]\fR and \fBOFFSET[i]\fR\&. This requires that the chunk data appears contiguously in the same order as the table of contents\&. +The chunk identifier \fBID[i]\fR is a label for the data stored within this file from \fBOFFSET[i]\fR (inclusive) to \fBOFFSET[i+1]\fR (exclusive)\&. Thus, the size of the \fBi`th chunk is equal to the difference between `OFFSET[i+1]\fR and \fBOFFSET[i]\fR\&. This requires that the chunk data appears contiguously in the same order as the table of contents\&. .sp The final entry in the table of contents must be four zero bytes\&. This confirms that the table of contents is ending and provides the offset for the end of the chunk\-based data\&. .sp @@ -68,7 +68,7 @@ Functions for working with chunk\-based file formats are declared in \fBchunk\-f .sp To write a chunk\-based file format, create a \fBstruct chunkfile\fR by calling \fBinit_chunkfile()\fR and pass a \fBstruct hashfile\fR pointer\&. The caller is responsible for opening the \fBhashfile\fR and writing header information so the file format is identifiable before the chunk\-based format begins\&. .sp -Then, call \fBadd_chunk()\fR for each chunk that is intended for write\&. This populates the \fBchunkfile\fR with information about the order and size of each chunk to write\&. Provide a \fBchunk_write_fn\fR function pointer to perform the write of the chunk data upon request\&. +Then, call \fBadd_chunk()\fR for each chunk that is intended for writing\&. This populates the \fBchunkfile\fR with information about the order and size of each chunk to write\&. Provide a \fBchunk_write_fn\fR function pointer to perform the write of the chunk data upon request\&. .sp Call \fBwrite_chunkfile()\fR to write the table of contents to the \fBhashfile\fR followed by each of the chunks\&. This will verify that each chunk wrote the expected amount of data so the table of contents is correct\&. .sp diff --git a/man5/gitformat-commit-graph.5 b/man5/gitformat-commit-graph.5 index a4f9b8e41..60e36a58d 100644 --- a/man5/gitformat-commit-graph.5 +++ b/man5/gitformat-commit-graph.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-commit-graph .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-index.5 b/man5/gitformat-index.5 index b38eca765..b85384fee 100644 --- a/man5/gitformat-index.5 +++ b/man5/gitformat-index.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFORMAT\-INDEX" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFORMAT\-INDEX" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5 index 5fad63ae3..b93426393 100644 --- a/man5/gitformat-pack.5 +++ b/man5/gitformat-pack.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFORMAT\-PACK" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFORMAT\-PACK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -40,7 +40,7 @@ $GIT_DIR/objects/pack/multi\-pack\-index .sp .SH "DESCRIPTION" .sp -The Git pack format is now Git stores most of its primary repository data\&. Over the lietime af a repository loose objects (if any) and smaller packs are consolidated into larger pack(s)\&. See \fBgit-gc\fR(1) and \fBgit-pack-objects\fR(1)\&. +The Git pack format is how Git stores most of its primary repository data\&. Over the lifetime of a repository, loose objects (if any) and smaller packs are consolidated into larger pack(s)\&. See \fBgit-gc\fR(1) and \fBgit-pack-objects\fR(1)\&. .sp The pack format is also used over\-the\-wire, see e\&.g\&. \fBgitprotocol-v2\fR(5), as well as being a part of other container formats in the case of \fBgitformat-bundle\fR(5)\&. .SH "CHECKSUMS AND OBJECT IDS" @@ -111,7 +111,7 @@ more than 4G objects in a pack\&. .sp -1 .IP \(bu 2.3 .\} -The header is followed by number of object entries, each of which looks like this: +The header is followed by a number of object entries, each of which looks like this: .sp .if n \{\ .RS 4 @@ -144,7 +144,7 @@ compressed delta data .RS 4 .\} .nf -Observation: length of each object is encoded in a variable +Observation: the length of each object is encoded in a variable length format and is not constrained to 32\-bit or anything\&. .fi .if n \{\ @@ -246,7 +246,7 @@ Both ofs\-delta and ref\-delta store the "delta" to be applied to another object .sp The base object could also be deltified if it\(cqs in the same pack\&. Ref\-delta can also refer to an object outside the pack (i\&.e\&. the so\-called "thin pack")\&. When stored on disk however, the pack should be self contained to avoid cyclic dependency\&. .sp -The delta data starts with the size of the base object and the size of the object to be reconstructed\&. These sizes are encoded using the size encoding from above\&. The remainder of the delta data is a sequence of instructions to reconstruct the object from the base object\&. If the base object is deltified, it must be converted to canonical form first\&. Each instruction appends more and more data to the target object until it\(cqs complete\&. There are two supported instructions so far: one for copy a byte range from the source object and one for inserting new data embedded in the instruction itself\&. +The delta data starts with the size of the base object and the size of the object to be reconstructed\&. These sizes are encoded using the size encoding from above\&. The remainder of the delta data is a sequence of instructions to reconstruct the object from the base object\&. If the base object is deltified, it must be converted to canonical form first\&. Each instruction appends more and more data to the target object until it\(cqs complete\&. There are two supported instructions so far: one for copying a byte range from the source object and one for inserting new data embedded in the instruction itself\&. .sp Each instruction has variable length\&. Instruction type is determined by the seventh bit of the first octet\&. The following diagrams follow the convention in RFC 1951 (Deflate compressed data format)\&. .sp @@ -272,7 +272,7 @@ Each instruction has variable length\&. Instruction type is determined by the se .sp This is the instruction format to copy a byte range from the source object\&. It encodes the offset to copy from and the number of bytes to copy\&. Offset and size are in little\-endian order\&. .sp -All offset and size bytes are optional\&. This is to reduce the instruction size when encoding small offsets or sizes\&. The first seven bits in the first octet determines which of the next seven octets is present\&. If bit zero is set, offset1 is present\&. If bit one is set offset2 is present and so on\&. +All offset and size bytes are optional\&. This is to reduce the instruction size when encoding small offsets or sizes\&. The first seven bits in the first octet determine which of the next seven octets is present\&. If bit zero is set, offset1 is present\&. If bit one is set offset2 is present and so on\&. .sp Note that a more compact instruction does not change offset and size encoding\&. For example, if only offset2 is omitted like below, offset3 still contains bits 16\-23\&. It does not become offset2 and contains bits 8\-15 even if it\(cqs right next to offset1\&. .sp @@ -311,7 +311,7 @@ In its most compact form, this instruction only takes up one byte (0x80) with bo .RE .\} .sp -This is the instruction to construct target object without the base object\&. The following data is appended to the target object\&. The first seven bits of the first octet determines the size of data in bytes\&. The size must be non\-zero\&. +This is the instruction to construct the target object without the base object\&. The following data is appended to the target object\&. The first seven bits of the first octet determine the size of data in bytes\&. The size must be non\-zero\&. .RE .sp .it 1 an-trap @@ -607,7 +607,7 @@ The same trailer as a v1 pack file: .RS 4 .\} .nf -A copy of the pack checksum at the end of +A copy of the pack checksum at the end of the corresponding packfile\&. .fi .if n \{\ diff --git a/man5/gitformat-signature.5 b/man5/gitformat-signature.5 index 0d41d0834..1eebcffba 100644 --- a/man5/gitformat-signature.5 +++ b/man5/gitformat-signature.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-signature .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFORMAT\-SIGNATURE" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFORMAT\-SIGNATURE" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/githooks.5 b/man5/githooks.5 index 3a4ed491c..ecba0554f 100644 --- a/man5/githooks.5 +++ b/man5/githooks.5 @@ -2,12 +2,12 @@ .\" Title: githooks .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITHOOKS" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITHOOKS" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -73,7 +73,7 @@ This hook is invoked by \fBgit-am\fR(1)\&. It takes no parameter, and is invoked .sp If it exits with non\-zero status, then the working tree will not be committed after applying the patch\&. .sp -It can be used to inspect the current working tree and refuse to make a commit if it does not pass certain test\&. +It can be used to inspect the current working tree and refuse to make a commit if it does not pass certain tests\&. .sp The default \fIpre\-applypatch\fR hook, when enabled, runs the \fIpre\-commit\fR hook, if the latter is enabled\&. .SS "post\-applypatch" @@ -107,7 +107,7 @@ It takes one to three parameters\&. The first is the name of the file that conta .sp If the exit status is non\-zero, \fBgit commit\fR will abort\&. .sp -The purpose of the hook is to edit the message file in place, and it is not suppressed by the \fB\-\-no\-verify\fR option\&. A non\-zero exit means a failure of the hook and aborts the commit\&. It should not be used as replacement for pre\-commit hook\&. +The purpose of the hook is to edit the message file in place, and it is not suppressed by the \fB\-\-no\-verify\fR option\&. A non\-zero exit means a failure of the hook and aborts the commit\&. It should not be used as a replacement for the pre\-commit hook\&. .sp The sample \fBprepare\-commit\-msg\fR hook that comes with Git removes the help message found in the commented portion of the commit template\&. .SS "commit\-msg" @@ -242,7 +242,7 @@ In an environment that restricts the users\*(Aq access only to git commands over .sp Both standard output and standard error output are forwarded to \fBgit send\-pack\fR on the other end, so you can simply \fBecho\fR messages for the user\&. .sp -The default \fIupdate\fR hook, when enabled\(emand with \fBhooks\&.allowunannotated\fR config option unset or set to false\(emprevents unannotated tags to be pushed\&. +The default \fIupdate\fR hook, when enabled\(emand with \fBhooks\&.allowunannotated\fR config option unset or set to false\(emprevents unannotated tags from being pushed\&. .SS "proc\-receive" .sp This hook is invoked by \fBgit-receive-pack\fR(1)\&. If the server has set the multi\-valued config variable \fBreceive\&.procReceiveRefs\fR, and the commands sent to \fIreceive\-pack\fR have matching reference names, these commands will be executed by this hook, instead of by the internal \fBexecute_commands()\fR function\&. This hook is responsible for updating the relevant references and reporting the results back to \fIreceive\-pack\fR\&. @@ -284,12 +284,12 @@ S: flush\-pkt .RS 4 .\} .nf -# Receive result from the hook\&. +# Receive results from the hook\&. # OK, run this command successfully\&. H: PKT\-LINE(ok <ref>) # NO, I reject it\&. H: PKT\-LINE(ng <ref> <reason>) -# Fall through, let \*(Aqreceive\-pack\*(Aq to execute it\&. +# Fall through, let \*(Aqreceive\-pack\*(Aq execute it\&. H: PKT\-LINE(ok <ref>) H: PKT\-LINE(option fall\-through) # OK, but has an alternate reference\&. The alternate reference name diff --git a/man5/gitignore.5 b/man5/gitignore.5 index c2a46ab0c..4a828d086 100644 --- a/man5/gitignore.5 +++ b/man5/gitignore.5 @@ -2,12 +2,12 @@ .\" Title: gitignore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITIGNORE" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITIGNORE" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5 index 5ec51ad50..e936410ca 100644 --- a/man5/gitmailmap.5 +++ b/man5/gitmailmap.5 @@ -2,12 +2,12 @@ .\" Title: gitmailmap .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITMAILMAP" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITMAILMAP" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmodules.5 b/man5/gitmodules.5 index acc6948cb..da531a5a2 100644 --- a/man5/gitmodules.5 +++ b/man5/gitmodules.5 @@ -2,12 +2,12 @@ .\" Title: gitmodules .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITMODULES" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITMODULES" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-capabilities.5 b/man5/gitprotocol-capabilities.5 index 0f3125590..2686dad7f 100644 --- a/man5/gitprotocol-capabilities.5 +++ b/man5/gitprotocol-capabilities.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-capabilities .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -59,7 +59,7 @@ On the very first line of the initial server response of either receive\-pack an .sp Client will then send a space separated list of capabilities it wants to be in effect\&. The client MUST NOT ask for capabilities the server did not say it supports\&. .sp -Server MUST diagnose and abort if capabilities it does not understand was sent\&. Server MUST NOT ignore capabilities that client requested and server advertised\&. As a consequence of these rules, server MUST NOT advertise capabilities it does not understand\&. +Server MUST diagnose and abort if capabilities it does not understand were sent\&. Server MUST NOT ignore capabilities that client requested and server advertised\&. As a consequence of these rules, server MUST NOT advertise capabilities it does not understand\&. .sp The \fIatomic\fR, \fIreport\-status\fR, \fIreport\-status\-v2\fR, \fIdelete\-refs\fR, \fIquiet\fR, and \fIpush\-cert\fR capabilities are sent and recognized by the receive\-pack (push to server) process\&. .sp @@ -72,7 +72,7 @@ The \fImulti_ack\fR capability allows the server to return "ACK obj\-id continue .sp By sending this early, the server can potentially head off the client from walking any further down that particular branch of the client\(cqs repository history\&. The client may still need to walk down other branches, sending have lines for those, until the server has a complete cut across the DAG, or the client has said "done"\&. .sp -Without multi_ack, a client sends have lines in \-\-date\-order until the server has found a common base\&. That means the client will send have lines that are already known by the server to be common, because they overlap in time with another branch that the server hasn\(cqt found a common base on yet\&. +Without multi_ack, a client sends have lines in \-\-date\-order until the server has found a common base\&. That means the client will send have lines that are already known by the server to be common, because they overlap in time with another branch on which the server hasn\(cqt found a common base yet\&. .sp For example suppose the client has commits in caps that the server doesn\(cqt and the server has commits in lower case that the client doesn\(cqt, as in the following diagram: .sp @@ -96,7 +96,7 @@ If the client wants x,y and starts out by saying have F,S, the server doesn\(cqt Without multi_ack the client would have sent that c\-b\-a chain anyway, interleaved with S\-R\-Q\&. .SH "MULTI_ACK_DETAILED" .sp -This is an extension of multi_ack that permits client to better understand the server\(cqs in\-memory state\&. See \fBgitprotocol-pack\fR(5), section "Packfile Negotiation" for more information\&. +This is an extension of multi_ack that permits the client to better understand the server\(cqs in\-memory state\&. See \fBgitprotocol-pack\fR(5), section "Packfile Negotiation" for more information\&. .SH "NO\-DONE" .sp This capability should only be used with the smart HTTP protocol\&. If multi_ack_detailed and no\-done are both present, then the sender is free to immediately send a pack following its first "ACK obj\-id ready" message\&. @@ -113,7 +113,7 @@ Receive\-pack, on the other hand, is assumed by default to be able to handle thi The reasons for this asymmetry are historical\&. The receive\-pack program did not exist until after the invention of thin packs, so historically the reference implementation of receive\-pack always understood thin packs\&. Adding \fIno\-thin\fR later allowed receive\-pack to disable the feature in a backwards\-compatible manner\&. .SH "SIDE\-BAND, SIDE\-BAND\-64K" .sp -This capability means that server can send, and client understand multiplexed progress reports and error info interleaved with the packfile itself\&. +This capability means that the server can send, and the client can understand, multiplexed progress reports and error info interleaved with the packfile itself\&. .sp These two options are mutually exclusive\&. A modern client always favors \fIside\-band\-64k\fR\&. .sp @@ -137,10 +137,10 @@ The "side\-band\-64k" capability came about as a way for newer clients that can .sp Further, with side\-band and its up to 1000\-byte messages, it\(cqs actually 999 bytes of payload and 1 byte for the stream code\&. With side\-band\-64k, same deal, you have up to 65519 bytes of data and 1 byte for the stream code\&. .sp -The client MUST send only maximum of one of "side\-band" and "side\- band\-64k"\&. Server MUST diagnose it as an error if client requests both\&. +The client MUST send only one of "side\-band" and "side\- band\-64k"\&. The server MUST diagnose it as an error if client requests both\&. .SH "OFS\-DELTA" .sp -Server can send, and client understand PACKv2 with delta referring to its base by position in pack rather than by an obj\-id\&. That is, they can send/read OBJ_OFS_DELTA (aka type 6) in a packfile\&. +The server can send, and the client can understand, PACKv2 with delta referring to its base by position in pack rather than by an obj\-id\&. That is, they can send/read OBJ_OFS_DELTA (aka type 6) in a packfile\&. .SH "AGENT" .sp The server may optionally send a capability of the form \fBagent=X\fR to notify the client that the server is running version \fBX\fR\&. The client may optionally return its own agent string by responding with an \fBagent=Y\fR capability (but it MUST NOT do so if the server did not mention the agent capability)\&. The \fBX\fR and \fBY\fR strings may contain any printable ASCII characters except space (i\&.e\&., the byte range 32 < x < 127), and are typically of the form "package/version" (e\&.g\&., "git/1\&.8\&.3\&.1")\&. The agent strings are purely informative for statistics and debugging purposes, and MUST NOT be used to programmatically assume the presence or absence of particular features\&. @@ -172,14 +172,14 @@ This capability adds "deepen\-not" command to fetch\-pack/upload\-pack protocol If this capability is requested by the client, the semantics of "deepen" command is changed\&. The "depth" argument is the depth from the current shallow boundary, instead of the depth from remote refs\&. .SH "NO\-PROGRESS" .sp -The client was started with "git clone \-q" or something, and doesn\(cqt want that side band 2\&. Basically the client just says "I do not wish to receive stream 2 on sideband, so do not send it to me, and if you did, I will drop it on the floor anyway"\&. However, the sideband channel 3 is still used for error responses\&. +The client was started with "git clone \-q" or something similar, and doesn\(cqt want that side band 2\&. Basically the client just says "I do not wish to receive stream 2 on sideband, so do not send it to me, and if you did, I will drop it on the floor anyway"\&. However, the sideband channel 3 is still used for error responses\&. .SH "INCLUDE\-TAG" .sp The \fIinclude\-tag\fR capability is about sending annotated tags if we are sending objects they point to\&. If we pack an object to the client, and a tag object points exactly at that object, we pack the tag object too\&. In general this allows a client to get all new annotated tags when it fetches a branch, in a single network connection\&. .sp Clients MAY always send include\-tag, hardcoding it into a request when the server advertises this capability\&. The decision for a client to request include\-tag only has to do with the client\(cqs desires for tag data, whether or not a server had advertised objects in the refs/tags/* namespace\&. .sp -Servers MUST pack the tags if their referrant is packed and the client has requested include\-tags\&. +Servers MUST pack the tags if their referent is packed and the client has requested include\-tags\&. .sp Clients MUST be prepared for the case where a server has ignored include\-tag and has not actually sent tags in the pack\&. In such cases the client SHOULD issue a subsequent fetch to acquire the tags that include\-tag would have otherwise given the client\&. .sp diff --git a/man5/gitprotocol-common.5 b/man5/gitprotocol-common.5 index 3f94479d4..99d4fbec9 100644 --- a/man5/gitprotocol-common.5 +++ b/man5/gitprotocol-common.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-common .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITPROTOCOL\-COMMON" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITPROTOCOL\-COMMON" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ gitprotocol-common \- Things common to various protocols .sp .SH "DESCRIPTION" .sp -This document sets defines things common to various over\-the\-wire protocols and file formats used in Git\&. +This document defines things common to various over\-the\-wire protocols and file formats used in Git\&. .SH "ABNF NOTATION" .sp ABNF notation as described by RFC 5234 is used within the protocol documents, except the following replacement core rules are used: diff --git a/man5/gitprotocol-http.5 b/man5/gitprotocol-http.5 index efae2f8c1..809b6a181 100644 --- a/man5/gitprotocol-http.5 +++ b/man5/gitprotocol-http.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-http .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITPROTOCOL\-HTTP" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITPROTOCOL\-HTTP" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -58,7 +58,7 @@ Within this documentation the placeholder \fB$GIT_URL\fR will stand for the http .sp Servers SHOULD handle all requests to locations matching \fB$GIT_URL\fR, as both the "smart" and "dumb" HTTP protocols used by Git operate by appending additional path components onto the end of the user supplied \fB$GIT_URL\fR string\&. .sp -An example of a dumb client requesting for a loose object: +An example of a dumb client requesting a loose object: .sp .if n \{\ .RS 4 @@ -457,7 +457,7 @@ C: Place any object seen into set \fBadvertised\fR\&. .sp C: Build an empty set, \fBcommon\fR, to hold the objects that are later determined to be on both ends\&. .sp -C: Build a set, \fBwant\fR, of the objects from \fBadvertised\fR the client wants to fetch, based on what it saw during ref discovery\&. +C: Build a set, \fBwant\fR, of the objects from \fBadvertised\fR that the client wants to fetch, based on what it saw during ref discovery\&. .sp C: Start a queue, \fBc_pending\fR, ordered by commit time (popping newest first)\&. Add all client refs\&. When a commit is popped from the queue its parents SHOULD be automatically inserted back\&. Commits MUST only enter the queue once\&. .sp @@ -514,7 +514,7 @@ The stream is terminated by a pkt\-line flush (\fB0000\fR)\&. .sp A single "want" or "have" command MUST have one hex formatted object name as its value\&. Multiple object names MUST be sent by sending multiple commands\&. Object names MUST be given using the object format negotiated through the \fBobject\-format\fR capability (default SHA\-1)\&. .sp -The \fBhave\fR list is created by popping the first 32 commits from \fBc_pending\fR\&. Less can be supplied if \fBc_pending\fR empties\&. +The \fBhave\fR list is created by popping the first 32 commits from \fBc_pending\fR\&. Fewer can be supplied if \fBc_pending\fR empties\&. .sp If the client has sent 256 "have" commits and has not yet received one of those back from \fBs_common\fR, or the client has emptied \fBc_pending\fR it SHOULD include a "done" command to let the server know it won\(cqt proceed: .sp diff --git a/man5/gitprotocol-pack.5 b/man5/gitprotocol-pack.5 index 6319e24f8..28d7b1543 100644 --- a/man5/gitprotocol-pack.5 +++ b/man5/gitprotocol-pack.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITPROTOCOL\-PACK" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITPROTOCOL\-PACK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -42,7 +42,7 @@ Git supports transferring data in packfiles over the ssh://, git://, http:// and The processes invoked in the canonical Git implementation are \fIupload\-pack\fR on the server side and \fIfetch\-pack\fR on the client side for fetching data; then \fIreceive\-pack\fR on the server and \fIsend\-pack\fR on the client for pushing data\&. The protocol functions to have a server tell a client what is currently on the server, then for the two to negotiate the smallest amount of data to send in order to fully update one or the other\&. .SH "PKT\-LINE FORMAT" .sp -The descriptions below build on the pkt\-line format described in \fBgitprotocol-common\fR(5)\&. When the grammar indicate \fBPKT\-LINE(\&.\&.\&.)\fR, unless otherwise noted the usual pkt\-line LF rules apply: the sender SHOULD include a LF, but the receiver MUST NOT complain if it is not present\&. +The descriptions below build on the pkt\-line format described in \fBgitprotocol-common\fR(5)\&. When the grammar indicates \fBPKT\-LINE(\&.\&.\&.)\fR, unless otherwise noted the usual pkt\-line LF rules apply: the sender SHOULD include a LF, but the receiver MUST NOT complain if it is not present\&. .sp An error packet is a special pkt\-line that contains an error string\&. .sp @@ -161,7 +161,7 @@ ssh user@example\&.com "git\-upload\-pack \*(Aq/project\&.git\*(Aq" .RE .\} .sp -In a "user@host:path" format URI, its relative to the user\(cqs home directory, because the Git client will run: +In a "user@host:path" format URI, it\(cqs relative to the user\(cqs home directory, because the Git client will run: .sp .if n \{\ .RS 4 @@ -349,7 +349,7 @@ Otherwise, if the client sent a positive depth request, the server will determin .\} .sp .sp -If the client has requested a positive depth, the server will compute the set of commits which are no deeper than the desired depth\&. The set of commits start at the client\(cqs wants\&. +If the client has requested a positive depth, the server will compute the set of commits which are no deeper than the desired depth\&. The set of commits starts at the client\(cqs wants\&. .sp The server writes \fIshallow\fR lines for each commit whose parents will not be sent as a result\&. The server writes an \fIunshallow\fR line for each commit which the client has indicated is shallow, but is no longer shallow at the currently requested depth (that is, its parents will now be sent)\&. The server MUST NOT mark as unshallow anything which the client has not indicated was shallow\&. .sp diff --git a/man5/gitprotocol-v2.5 b/man5/gitprotocol-v2.5 index de9139594..d32c0f725 100644 --- a/man5/gitprotocol-v2.5 +++ b/man5/gitprotocol-v2.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-v2 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITPROTOCOL\-V2" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITPROTOCOL\-V2" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -106,7 +106,7 @@ ls\-refs command to explicitly request some refs Designed with http and stateless\-rpc in mind\&. With clear flush semantics the http remote helper can simply act as a proxy .RE .sp -In protocol v2 communication is command oriented\&. When first contacting a server a list of capabilities will advertised\&. Some of these capabilities will be commands which a client can request be executed\&. Once a command has completed, a client can reuse the connection and request that other commands be executed\&. +In protocol v2 communication is command oriented\&. When first contacting a server a list of capabilities will be advertised\&. Some of these capabilities will be commands which a client can request be executed\&. Once a command has completed, a client can reuse the connection and request that other commands be executed\&. .SH "PACKET\-LINE FRAMING" .sp All communication is done using packet\-line framing, just as in v1\&. See \fBgitprotocol-pack\fR(5) and \fBgitprotocol-common\fR(5) for more information\&. diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5 index f6ab48c86..8c678fe8c 100644 --- a/man5/gitrepository-layout.5 +++ b/man5/gitrepository-layout.5 @@ -2,12 +2,12 @@ .\" Title: gitrepository-layout .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -508,7 +508,7 @@ The value of this key is the name of the promisor remote\&. \fBworktreeConfig\fR .RS 4 .sp -If set, by default "git config" reads from both "config" and "config\&.worktree" file from GIT_DIR in that order\&. In multiple working directory mode, "config" file is shared while "config\&.worktree" is per\-working directory (i\&.e\&., it\(cqs in GIT_COMMON_DIR/worktrees/<id>/config\&.worktree) +If set, by default "git config" reads from both "config" and "config\&.worktree" files from GIT_DIR in that order\&. In multiple working directory mode, "config" file is shared while "config\&.worktree" is per\-working directory (i\&.e\&., it\(cqs in GIT_COMMON_DIR/worktrees/<id>/config\&.worktree) .RE .SH "SEE ALSO" .sp diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5 index 6a2d7b0b3..b45ef2f11 100644 --- a/man5/gitweb.conf.5 +++ b/man5/gitweb.conf.5 @@ -2,12 +2,12 @@ .\" Title: gitweb.conf .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITWEB\&.CONF" "5" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITWEB\&.CONF" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -94,7 +94,7 @@ common system\-wide configuration file (defaults to .\} either per\-instance configuration file (defaults to \fIgitweb_config\&.perl\fR -in the same directory as the installed gitweb), or if it does not exists then fallback system\-wide configuration file (defaults to +in the same directory as the installed gitweb), or if it does not exist then fallback system\-wide configuration file (defaults to \fB/etc/gitweb\&.conf\fR)\&. .RE .sp diff --git a/man7/gitcli.7 b/man7/gitcli.7 index c91677a00..c4fd207f8 100644 --- a/man7/gitcli.7 +++ b/man7/gitcli.7 @@ -2,12 +2,12 @@ .\" Title: gitcli .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITCLI" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITCLI" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,7 +46,7 @@ Many commands take revisions (most often "commits", but sometimes "tree\-ish", d .sp -1 .IP \(bu 2.3 .\} -Options come first and then args\&. A subcommand may take dashed options (which may take their own arguments, e\&.g\&. "\-\-max\-parents 2") and arguments\&. You SHOULD give dashed options first and then arguments\&. Some commands may accept dashed options after you have already gave non\-option arguments (which may make the command ambiguous), but you should not rely on it (because eventually we may find a way to fix these ambiguity by enforcing the "options then args" rule)\&. +Options come first and then args\&. A subcommand may take dashed options (which may take their own arguments, e\&.g\&. "\-\-max\-parents 2") and arguments\&. You SHOULD give dashed options first and then arguments\&. Some commands may accept dashed options after you have already given non\-option arguments (which may make the command ambiguous), but you should not rely on it (because eventually we may find a way to fix these ambiguities by enforcing the "options then args" rule)\&. .RE .sp .RS 4 @@ -81,7 +81,7 @@ When an argument can be misunderstood as either a revision or a path, they can b \fB\-\-\fR between them\&. E\&.g\&. \fBgit diff \-\- HEAD\fR -is, "I have a file called HEAD in my work tree\&. Please show changes between the version I staged in the index and what I have in the work tree for that file", not "show difference between the HEAD commit and the work tree as a whole"\&. You can say +is, "I have a file called HEAD in my work tree\&. Please show changes between the version I staged in the index and what I have in the work tree for that file", not "show the difference between the HEAD commit and the work tree as a whole"\&. You can say \fBgit diff HEAD \-\-\fR to ask for the latter\&. .RE @@ -95,7 +95,7 @@ to ask for the latter\&. .IP \(bu 2.3 .\} Without disambiguating -\fB\-\-\fR, Git makes a reasonable guess, but errors out and asking you to disambiguate when ambiguous\&. E\&.g\&. if you have a file called HEAD in your work tree, +\fB\-\-\fR, Git makes a reasonable guess, but errors out and asks you to disambiguate when ambiguous\&. E\&.g\&. if you have a file called HEAD in your work tree, \fBgit diff HEAD\fR is ambiguous, and you have to say either \fBgit diff HEAD \-\-\fR diff --git a/man7/gitcore-tutorial.7 b/man7/gitcore-tutorial.7 index 8c70f9a42..7b6fdece9 100644 --- a/man7/gitcore-tutorial.7 +++ b/man7/gitcore-tutorial.7 @@ -2,12 +2,12 @@ .\" Title: gitcore-tutorial .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITCORE\-TUTORIAL" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITCORE\-TUTORIAL" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcredentials.7 b/man7/gitcredentials.7 index 8e481ccd6..3df9dc90c 100644 --- a/man7/gitcredentials.7 +++ b/man7/gitcredentials.7 @@ -2,12 +2,12 @@ .\" Title: gitcredentials .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITCREDENTIALS" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITCREDENTIALS" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcvs-migration.7 b/man7/gitcvs-migration.7 index dfe348b70..a048c1d7a 100644 --- a/man7/gitcvs-migration.7 +++ b/man7/gitcvs-migration.7 @@ -2,12 +2,12 @@ .\" Title: gitcvs-migration .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITCVS\-MIGRATION" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITCVS\-MIGRATION" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitdiffcore.7 b/man7/gitdiffcore.7 index b81f08e69..d12871b06 100644 --- a/man7/gitdiffcore.7 +++ b/man7/gitdiffcore.7 @@ -2,12 +2,12 @@ .\" Title: gitdiffcore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITDIFFCORE" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITDIFFCORE" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -273,14 +273,14 @@ the original contents of fileY and the resulting contents of file0 are compared, .sp In both rename and copy detection, the same "extent of changes" algorithm used in diffcore\-break is used to determine if two files are "similar enough", and can be customized to use a similarity score different from the default of 50% by giving a number after the "\-M" or "\-C" option (e\&.g\&. "\-M8" to tell it to use 8/10 = 80%)\&. .sp -Note that when rename detection is on but both copy and break detection are off, rename detection adds a preliminary step that first checks if files are moved across directories while keeping their filename the same\&. If there is a file added to a directory whose contents is sufficiently similar to a file with the same name that got deleted from a different directory, it will mark them as renames and exclude them from the later quadratic step (the one that pairwise compares all unmatched files to find the "best" matches, determined by the highest content similarity)\&. So, for example, if a deleted docs/ext\&.txt and an added docs/config/ext\&.txt are similar enough, they will be marked as a rename and prevent an added docs/ext\&.md that may be even more similar to the deleted docs/ext\&.txt from being considered as the rename destination in the later step\&. For this reason, the preliminary "match same filename" step uses a bit higher threshold to mark a file pair as a rename and stop considering other candidates for better matches\&. At most, one comparison is done per file in this preliminary pass; so if there are several remaining ext\&.txt files throughout the directory hierarchy after exact rename detection, this preliminary step may be skipped for those files\&. +Note that when rename detection is on but both copy and break detection are off, rename detection adds a preliminary step that first checks if files are moved across directories while keeping their filename the same\&. If there is a file added to a directory whose contents are sufficiently similar to a file with the same name that got deleted from a different directory, it will mark them as renames and exclude them from the later quadratic step (the one that pairwise compares all unmatched files to find the "best" matches, determined by the highest content similarity)\&. So, for example, if a deleted docs/ext\&.txt and an added docs/config/ext\&.txt are similar enough, they will be marked as a rename and prevent an added docs/ext\&.md that may be even more similar to the deleted docs/ext\&.txt from being considered as the rename destination in the later step\&. For this reason, the preliminary "match same filename" step uses a bit higher threshold to mark a file pair as a rename and stop considering other candidates for better matches\&. At most, one comparison is done per file in this preliminary pass; so if there are several remaining ext\&.txt files throughout the directory hierarchy after exact rename detection, this preliminary step may be skipped for those files\&. .sp Note\&. When the "\-C" option is used with \fB\-\-find\-copies\-harder\fR option, \fIgit diff\-*\fR commands feed unmodified filepairs to diffcore mechanism as well as modified ones\&. This lets the copy detector consider unmodified files as copy source candidates at the expense of making it slower\&. Without \fB\-\-find\-copies\-harder\fR, \fIgit diff\-*\fR commands can detect copies only if the file that was copied happened to have been modified in the same changeset\&. .SH "DIFFCORE\-MERGE\-BROKEN: FOR PUTTING COMPLETE REWRITES BACK TOGETHER" .sp This transformation is used to merge filepairs broken by diffcore\-break, and not transformed into rename/copy by diffcore\-rename, back into a single modification\&. This always runs when diffcore\-break is used\&. .sp -For the purpose of merging broken filepairs back, it uses a different "extent of changes" computation from the ones used by diffcore\-break and diffcore\-rename\&. It counts only the deletion from the original, and does not count insertion\&. If you removed only 10 lines from a 100\-line document, even if you added 910 new lines to make a new 1000\-line document, you did not do a complete rewrite\&. diffcore\-break breaks such a case in order to help diffcore\-rename to consider such filepairs as candidate of rename/copy detection, but if filepairs broken that way were not matched with other filepairs to create rename/copy, then this transformation merges them back into the original "modification"\&. +For the purpose of merging broken filepairs back, it uses a different "extent of changes" computation from the ones used by diffcore\-break and diffcore\-rename\&. It counts only the deletion from the original, and does not count insertion\&. If you removed only 10 lines from a 100\-line document, even if you added 910 new lines to make a new 1000\-line document, you did not do a complete rewrite\&. diffcore\-break breaks such a case in order to help diffcore\-rename to consider such filepairs as a candidate of rename/copy detection, but if filepairs broken that way were not matched with other filepairs to create rename/copy, then this transformation merges them back into the original "modification"\&. .sp The "extent of changes" parameter can be tweaked from the default 80% (that is, unless more than 80% of the original material is deleted, the broken pairs are merged back into a single modification) by giving a second number to \-B option, like these: .sp @@ -306,14 +306,14 @@ The "extent of changes" parameter can be tweaked from the default 80% (that is, \-B/60 (the same as above, since diffcore\-break defaults to 50%)\&. .RE .sp -Note that earlier implementation left a broken pair as a separate creation and deletion patches\&. This was an unnecessary hack and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is formatted differently for easier review in case of such a complete rewrite by showing the entire contents of old version prefixed with \fI\-\fR, followed by the entire contents of new version prefixed with \fI+\fR\&. +Note that earlier implementation left a broken pair as separate creation and deletion patches\&. This was an unnecessary hack, and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is formatted differently for easier review in case of such a complete rewrite by showing the entire contents of the old version prefixed with \fI\-\fR, followed by the entire contents of the new version prefixed with \fI+\fR\&. .SH "DIFFCORE\-PICKAXE: FOR DETECTING ADDITION/DELETION OF SPECIFIED STRING" .sp This transformation limits the set of filepairs to those that change specified strings between the preimage and the postimage in a certain way\&. \-S<block of text> and \-G<regular expression> options are used to specify different ways these strings are sought\&. .sp "\-S<block of text>" detects filepairs whose preimage and postimage have different number of occurrences of the specified block of text\&. By definition, it will not detect in\-file moves\&. Also, when a changeset moves a file wholesale without affecting the interesting string, diffcore\-rename kicks in as usual, and \fB\-S\fR omits the filepair (since the number of occurrences of that string didn\(cqt change in that rename\-detected filepair)\&. When used with \fB\-\-pickaxe\-regex\fR, treat the <block of text> as an extended POSIX regular expression to match, instead of a literal string\&. .sp -"\-G<regular expression>" (mnemonic: grep) detects filepairs whose textual diff has an added or a deleted line that matches the given regular expression\&. This means that it will detect in\-file (or what rename\-detection considers the same file) moves, which is noise\&. The implementation runs diff twice and greps, and this can be quite expensive\&. To speed things up binary files without textconv filters will be ignored\&. +"\-G<regular expression>" (mnemonic: grep) detects filepairs whose textual diff has an added or a deleted line that matches the given regular expression\&. This means that it will detect in\-file (or what rename\-detection considers the same file) moves, which is noise\&. The implementation runs diff twice and greps, and this can be quite expensive\&. To speed things up, binary files without textconv filters will be ignored\&. .sp When \fB\-S\fR or \fB\-G\fR are used without \fB\-\-pickaxe\-all\fR, only filepairs that match their respective criterion are kept in the output\&. When \fB\-\-pickaxe\-all\fR is used, if even one filepair matches their respective criterion in a changeset, the entire changeset is kept\&. This behavior is designed to make reviewing changes in the context of the whole changeset easier\&. .SH "DIFFCORE\-ORDER: FOR SORTING THE OUTPUT BASED ON FILENAMES" diff --git a/man7/giteveryday.7 b/man7/giteveryday.7 index 240256d5f..786338a0d 100644 --- a/man7/giteveryday.7 +++ b/man7/giteveryday.7 @@ -2,12 +2,12 @@ .\" Title: giteveryday .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITEVERYDAY" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITEVERYDAY" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,7 +34,7 @@ giteveryday \- A useful minimum set of commands for Everyday Git Everyday Git With 20 Commands Or So .SH "DESCRIPTION" .sp -Git users can broadly be grouped into four categories for the purposes of describing here a small set of useful command for everyday Git\&. +Git users can broadly be grouped into four categories for the purposes of describing here a small set of useful commands for everyday Git\&. .sp .RS 4 .ie n \{\ diff --git a/man7/gitfaq.7 b/man7/gitfaq.7 index 1e4c18c48..4885496fa 100644 --- a/man7/gitfaq.7 +++ b/man7/gitfaq.7 @@ -2,12 +2,12 @@ .\" Title: gitfaq .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITFAQ" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITFAQ" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index e0dafde1d..b0fcd54c6 100644 --- a/man7/gitglossary.7 +++ b/man7/gitglossary.7 @@ -2,12 +2,12 @@ .\" Title: gitglossary .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITGLOSSARY" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITGLOSSARY" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -311,7 +311,7 @@ at the root of a working tree that points at the directory that is the real repo .PP grafts .RS 4 -Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits\&. This way you can make Git pretend the set of +Grafts enable two otherwise different lines of development to be joined together by recording fake ancestry information for commits\&. This way you can make Git pretend the set of parents a commit diff --git a/man7/gitnamespaces.7 b/man7/gitnamespaces.7 index 64dd09d6f..44f66f2df 100644 --- a/man7/gitnamespaces.7 +++ b/man7/gitnamespaces.7 @@ -2,12 +2,12 @@ .\" Title: gitnamespaces .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITNAMESPACES" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITNAMESPACES" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitremote-helpers.7 b/man7/gitremote-helpers.7 index 0ec277133..5cda54670 100644 --- a/man7/gitremote-helpers.7 +++ b/man7/gitremote-helpers.7 @@ -2,12 +2,12 @@ .\" Title: gitremote-helpers .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITREMOTE\-HELPERS" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITREMOTE\-HELPERS" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitrevisions.7 b/man7/gitrevisions.7 index 22a3e098d..bed9af827 100644 --- a/man7/gitrevisions.7 +++ b/man7/gitrevisions.7 @@ -2,12 +2,12 @@ .\" Title: gitrevisions .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITREVISIONS" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITREVISIONS" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitsubmodules.7 b/man7/gitsubmodules.7 index e13ed8268..c2cb1ea3c 100644 --- a/man7/gitsubmodules.7 +++ b/man7/gitsubmodules.7 @@ -2,12 +2,12 @@ .\" Title: gitsubmodules .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITSUBMODULES" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITSUBMODULES" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -122,7 +122,7 @@ Submodule operations can be configured using the following mechanisms (from high .\} The command line for those commands that support taking submodules as part of their pathspecs\&. Most commands have a boolean flag \fB\-\-recurse\-submodules\fR -which specify whether to recurse into submodules\&. Examples are +which specifies whether to recurse into submodules\&. Examples are \fBgrep\fR and \fBcheckout\fR\&. Some commands take enums, such as @@ -347,7 +347,7 @@ For example: .RE .\} .sp -In the above config only the submodule \fIbar\fR and \fIbaz\fR are active, \fIbar\fR due to (1) and \fIbaz\fR due to (3)\&. \fIfoo\fR is inactive because (1) takes precedence over (3) +In the above config only the submodules \fIbar\fR and \fIbaz\fR are active, \fIbar\fR due to (1) and \fIbaz\fR due to (3)\&. \fIfoo\fR is inactive because (1) takes precedence over (3) .sp Note that (3) is a historical artefact and will be ignored if the (1) and (2) specify that the submodule is not active\&. In other words, if we have a \fBsubmodule\&.<name>\&.active\fR set to \fBfalse\fR or if the submodule\(cqs path is excluded in the pathspec in \fBsubmodule\&.active\fR, the url doesn\(cqt matter whether it is present or not\&. This is illustrated in the example that follows\&. .sp @@ -499,7 +499,7 @@ git reset .\} .SH "IMPLEMENTATION DETAILS" .sp -When cloning or pulling a repository containing submodules the submodules will not be checked out by default; you can instruct \fBclone\fR to recurse into submodules\&. The \fBinit\fR and \fBupdate\fR subcommands of \fBgit submodule\fR will maintain submodules checked out and at an appropriate revision in your working tree\&. Alternatively you can set \fBsubmodule\&.recurse\fR to have \fBcheckout\fR recursing into submodules (note that \fBsubmodule\&.recurse\fR also affects other Git commands, see \fBgit-config\fR(1) for a complete list)\&. +When cloning or pulling a repository containing submodules the submodules will not be checked out by default; you can instruct \fBclone\fR to recurse into submodules\&. The \fBinit\fR and \fBupdate\fR subcommands of \fBgit submodule\fR will maintain submodules checked out and at an appropriate revision in your working tree\&. Alternatively you can set \fBsubmodule\&.recurse\fR to have \fBcheckout\fR recurse into submodules (note that \fBsubmodule\&.recurse\fR also affects other Git commands, see \fBgit-config\fR(1) for a complete list)\&. .SH "SEE ALSO" .sp \fBgit-submodule\fR(1), \fBgitmodules\fR(5)\&. diff --git a/man7/gittutorial-2.7 b/man7/gittutorial-2.7 index f855228e1..81e12e219 100644 --- a/man7/gittutorial-2.7 +++ b/man7/gittutorial-2.7 @@ -2,12 +2,12 @@ .\" Title: gittutorial-2 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITTUTORIAL\-2" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITTUTORIAL\-2" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial.7 b/man7/gittutorial.7 index a9818e239..4df6c5e11 100644 --- a/man7/gittutorial.7 +++ b/man7/gittutorial.7 @@ -2,12 +2,12 @@ .\" Title: gittutorial .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITTUTORIAL" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITTUTORIAL" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitworkflows.7 b/man7/gitworkflows.7 index 3191eaf26..0886a1d35 100644 --- a/man7/gitworkflows.7 +++ b/man7/gitworkflows.7 @@ -2,12 +2,12 @@ .\" Title: gitworkflows .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GITWORKFLOWS" "7" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GITWORKFLOWS" "7" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |