summaryrefslogtreecommitdiffstats
path: root/man5
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:58 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-23 14:45:58 -0700
commitb6372084f858f691ddb2964c4be8472fd62a93a2 (patch)
tree230ac84650905c477af7ce5dcb029aa74102ac8d /man5
parentde2d9f3304febd6da7d7c63f2dbd49471eb2a2d8 (diff)
downloadgit-manpages-b6372084f858f691ddb2964c4be8472fd62a93a2.tar.gz
Autogenerated manpages for v2.42.0-482-g2e8e7
Diffstat (limited to 'man5')
-rw-r--r--man5/gitattributes.56
-rw-r--r--man5/gitformat-bundle.512
-rw-r--r--man5/gitformat-chunk.510
-rw-r--r--man5/gitformat-commit-graph.56
-rw-r--r--man5/gitformat-index.56
-rw-r--r--man5/gitformat-pack.520
-rw-r--r--man5/gitformat-signature.56
-rw-r--r--man5/githooks.516
-rw-r--r--man5/gitignore.56
-rw-r--r--man5/gitmailmap.56
-rw-r--r--man5/gitmodules.56
-rw-r--r--man5/gitprotocol-capabilities.522
-rw-r--r--man5/gitprotocol-common.58
-rw-r--r--man5/gitprotocol-http.512
-rw-r--r--man5/gitprotocol-pack.512
-rw-r--r--man5/gitprotocol-v2.58
-rw-r--r--man5/gitrepository-layout.58
-rw-r--r--man5/gitweb.conf.58
18 files changed, 89 insertions, 89 deletions
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