summaryrefslogtreecommitdiffstats
path: root/man5
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-06-30 12:50:50 -0700
committerJunio C Hamano <gitster@pobox.com>2023-06-30 12:50:50 -0700
commit28d241d9d5b2db43dec59366e7342792c66472d7 (patch)
tree18fc5120c5a7a20ae4e872a52f652a833bc7900f /man5
parent2c0d7de4038410ea29b5cb6e53b75a13ec45e4fe (diff)
downloadgit-manpages-28d241d9d5b2db43dec59366e7342792c66472d7.tar.gz
Autogenerated manpages for v2.41.0-236-g9748a
Diffstat (limited to 'man5')
-rw-r--r--man5/gitattributes.58
-rw-r--r--man5/gitformat-bundle.56
-rw-r--r--man5/gitformat-chunk.56
-rw-r--r--man5/gitformat-commit-graph.56
-rw-r--r--man5/gitformat-index.56
-rw-r--r--man5/gitformat-pack.56
-rw-r--r--man5/gitformat-signature.56
-rw-r--r--man5/githooks.56
-rw-r--r--man5/gitignore.56
-rw-r--r--man5/gitmailmap.56
-rw-r--r--man5/gitmodules.56
-rw-r--r--man5/gitprotocol-capabilities.56
-rw-r--r--man5/gitprotocol-common.56
-rw-r--r--man5/gitprotocol-http.56
-rw-r--r--man5/gitprotocol-pack.56
-rw-r--r--man5/gitprotocol-v2.56
-rw-r--r--man5/gitrepository-layout.56
-rw-r--r--man5/gitweb.conf.56
18 files changed, 55 insertions, 55 deletions
diff --git a/man5/gitattributes.5 b/man5/gitattributes.5
index 4dc671f59..eb8b917d4 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITATTRIBUTES" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITATTRIBUTES" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -1596,7 +1596,7 @@ 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)\&.
.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\&.
+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
diff --git a/man5/gitformat-bundle.5 b/man5/gitformat-bundle.5
index 489c382ce..0191efcf9 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITFORMAT\-BUNDLE" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITFORMAT\-BUNDLE" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitformat-chunk.5 b/man5/gitformat-chunk.5
index 312ab0d2d..01c8d8750 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITFORMAT\-CHUNK" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITFORMAT\-CHUNK" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitformat-commit-graph.5 b/man5/gitformat-commit-graph.5
index 0c4c68b5d..ce00d935f 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitformat-index.5 b/man5/gitformat-index.5
index a59f4dc50..bee7880e4 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITFORMAT\-INDEX" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITFORMAT\-INDEX" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5
index 79c82e62a..bb47ac81e 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITFORMAT\-PACK" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITFORMAT\-PACK" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitformat-signature.5 b/man5/gitformat-signature.5
index 3a098729d..3d6751139 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITFORMAT\-SIGNATURE" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITFORMAT\-SIGNATURE" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/githooks.5 b/man5/githooks.5
index 572f90f02..2e19428d1 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITHOOKS" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITHOOKS" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitignore.5 b/man5/gitignore.5
index 013babfcb..f4c9c2fc0 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITIGNORE" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITIGNORE" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5
index 2c61669e9..fbf4c61cf 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITMAILMAP" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITMAILMAP" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitmodules.5 b/man5/gitmodules.5
index 2e59e8a02..a145c6c6f 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITMODULES" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITMODULES" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-capabilities.5 b/man5/gitprotocol-capabilities.5
index 0b0d8add2..76264dd46 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-common.5 b/man5/gitprotocol-common.5
index df127d7a8..b8cf4ef73 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITPROTOCOL\-COMMON" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITPROTOCOL\-COMMON" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-http.5 b/man5/gitprotocol-http.5
index 3c72d7e82..991634855 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITPROTOCOL\-HTTP" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITPROTOCOL\-HTTP" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-pack.5 b/man5/gitprotocol-pack.5
index 67f075562..b8d059f93 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITPROTOCOL\-PACK" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITPROTOCOL\-PACK" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitprotocol-v2.5 b/man5/gitprotocol-v2.5
index 9d8dcea39..6050c5c13 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITPROTOCOL\-V2" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITPROTOCOL\-V2" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5
index d272643ae..751115191 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5
index 8061077ff..295674119 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-06-26
+.\" Date: 2023-06-29
.\" Manual: Git Manual
-.\" Source: Git 2.41.0.199.ga9e066fa63
+.\" Source: Git 2.41.0.236.g9748a68200
.\" Language: English
.\"
-.TH "GITWEB\&.CONF" "5" "2023\-06\-26" "Git 2\&.41\&.0\&.199\&.ga9e066" "Git Manual"
+.TH "GITWEB\&.CONF" "5" "2023\-06\-29" "Git 2\&.41\&.0\&.236\&.g9748a6" "Git Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------