Autogenerated manpages for v2.43.0-522-g2a540

18 files changed, 56 insertions, 56 deletions

diff --git a/man5/gitattributes.5 b/man5/gitattributes.5
index 83b7431f3..f96260201 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITATTRIBUTES" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITATTRIBUTES" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1600,13 +1600,13 @@ To define a custom merge driver \fBfilfre\fR, add a section to your \fB$GIT_DIR/
 .sp
 The \fBmerge\&.*\&.name\fR variable gives the driver a human\-readable name\&.
 .sp
-The \(oqmerge\&.*\&.driver` variable\(cqs value is used to construct a command to run to merge ancestor\(cqs version (\fB%O\fR), current version (\fB%A\fR) and the other branches\(cq version (\fB%B\fR)\&. These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is built\&. Additionally, %L will be replaced with the conflict marker size (see below)\&.
+The \(oqmerge\&.*\&.driver` variable\(cqs value is used to construct a command to run to common ancestor\(cqs version (\fB%O\fR), current version (\fB%A\fR) and the other branches\(cq version (\fB%B\fR)\&. These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is built\&. Additionally, \fB%L\fR will be replaced with the conflict marker size (see below)\&.
 .sp
 The merge driver is expected to leave the result of the merge in the file named with \fB%A\fR by overwriting it, and exit with zero status if it managed to merge them cleanly, or non\-zero if there were conflicts\&. When the driver crashes (e\&.g\&. killed by SEGV), it is expected to exit with non\-zero status that are higher than 128, and in such a case, the merge results in a failure (which is different from producing a conflict)\&.
 .sp
 The \fBmerge\&.*\&.recursive\fR variable specifies what other merge driver to use when the merge driver is called for an internal merge between common ancestors, when there are more than one\&. When left unspecified, the driver itself is used for both internal merge and the final merge\&.
 .sp
-The merge driver can learn the pathname in which the merged result will be stored via placeholder \fB%P\fR\&.
+The merge driver can learn the pathname in which the merged result will be stored via placeholder \fB%P\fR\&. The conflict labels to be used for the common ancestor, local head and other head can be passed by using \fI%S\fR, \fI%X\fR and \*(Aq%Y` respectively\&.
 .RE
 .sp
 .it 1 an-trap
diff --git a/man5/gitformat-bundle.5 b/man5/gitformat-bundle.5
index 55ef87102..5bb987b49 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITFORMAT\-BUNDLE" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITFORMAT\-BUNDLE" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitformat-chunk.5 b/man5/gitformat-chunk.5
index b5f2da0b1..44ae592a4 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITFORMAT\-CHUNK" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITFORMAT\-CHUNK" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitformat-commit-graph.5 b/man5/gitformat-commit-graph.5
index 9694fd78f..d59e99b75 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitformat-index.5 b/man5/gitformat-index.5
index cefd413b3..3cb9c6b98 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITFORMAT\-INDEX" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITFORMAT\-INDEX" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5
index 1ddd2645e..75aaee38b 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITFORMAT\-PACK" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITFORMAT\-PACK" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitformat-signature.5 b/man5/gitformat-signature.5
index cf7ccffca..b974e186f 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITFORMAT\-SIGNATURE" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITFORMAT\-SIGNATURE" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/githooks.5 b/man5/githooks.5
index 10537f022..8cd9f9a30 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITHOOKS" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITHOOKS" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitignore.5 b/man5/gitignore.5
index feccd9f14..7379fe620 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITIGNORE" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITIGNORE" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5
index b4910f269..473b146fa 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITMAILMAP" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITMAILMAP" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitmodules.5 b/man5/gitmodules.5
index 273bd6b64..136df8edc 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITMODULES" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITMODULES" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-capabilities.5 b/man5/gitprotocol-capabilities.5
index c90897f5a..4d10b9714 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITPROTOCOL\-CAPABILITIES" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITPROTOCOL\-CAPABILITIES" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-common.5 b/man5/gitprotocol-common.5
index 802c92b01..5d8845e08 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITPROTOCOL\-COMMON" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITPROTOCOL\-COMMON" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-http.5 b/man5/gitprotocol-http.5
index aa8913eee..0ff6f14cc 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITPROTOCOL\-HTTP" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITPROTOCOL\-HTTP" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-pack.5 b/man5/gitprotocol-pack.5
index 88a72150a..3f5f22fd2 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITPROTOCOL\-PACK" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITPROTOCOL\-PACK" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-v2.5 b/man5/gitprotocol-v2.5
index 0e496117b..800e1ebfe 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITPROTOCOL\-V2" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITPROTOCOL\-V2" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5
index c039944b2..125d7913f 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITREPOSITORY\-LAYOUT" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITREPOSITORY\-LAYOUT" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5
index 3e21f9693..a39ea50ad 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: 2024-01-30
+.\"      Date: 2024-02-02
 .\"    Manual: Git Manual
-.\"    Source: Git 2.43.0.493.gbc7ee2e5e1
+.\"    Source: Git 2.43.0.522.g2a540e432f
 .\"  Language: English
 .\"
-.TH "GITWEB\&.CONF" "5" "2024\-01\-30" "Git 2\&.43\&.0\&.493\&.gbc7ee2" "Git Manual"
+.TH "GITWEB\&.CONF" "5" "2024\-02\-02" "Git 2\&.43\&.0\&.522\&.g2a540e" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------