diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:16 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 08:44:16 +0900 |
commit | 62f36109c27098b1a12cb9deadcccc3aa212c404 (patch) | |
tree | 103e3e244c8494486464daeae0401b5d6a610a96 /man5 | |
parent | b6372084f858f691ddb2964c4be8472fd62a93a2 (diff) | |
download | git-manpages-62f36109c27098b1a12cb9deadcccc3aa212c404.tar.gz |
Autogenerated manpages for v2.42.0-526-g3130c1
Diffstat (limited to 'man5')
-rw-r--r-- | man5/gitattributes.5 | 8 | ||||
-rw-r--r-- | man5/gitformat-bundle.5 | 6 | ||||
-rw-r--r-- | man5/gitformat-chunk.5 | 6 | ||||
-rw-r--r-- | man5/gitformat-commit-graph.5 | 6 | ||||
-rw-r--r-- | man5/gitformat-index.5 | 6 | ||||
-rw-r--r-- | man5/gitformat-pack.5 | 6 | ||||
-rw-r--r-- | man5/gitformat-signature.5 | 6 | ||||
-rw-r--r-- | man5/githooks.5 | 6 | ||||
-rw-r--r-- | man5/gitignore.5 | 6 | ||||
-rw-r--r-- | man5/gitmailmap.5 | 6 | ||||
-rw-r--r-- | man5/gitmodules.5 | 6 | ||||
-rw-r--r-- | man5/gitprotocol-capabilities.5 | 6 | ||||
-rw-r--r-- | man5/gitprotocol-common.5 | 6 | ||||
-rw-r--r-- | man5/gitprotocol-http.5 | 6 | ||||
-rw-r--r-- | man5/gitprotocol-pack.5 | 6 | ||||
-rw-r--r-- | man5/gitprotocol-v2.5 | 6 | ||||
-rw-r--r-- | man5/gitrepository-layout.5 | 6 | ||||
-rw-r--r-- | man5/gitweb.conf.5 | 6 |
18 files changed, 55 insertions, 55 deletions
diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index ebb988937..7de2a0a32 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITATTRIBUTES" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1611,7 +1611,7 @@ The merge driver can learn the pathname in which the merged result will be store \fBconflict-marker-size\fR .RS 4 .sp -This attribute controls the length of conflict markers left in the work tree file during a conflicted merge\&. Only setting to the value to a positive integer has any meaningful effect\&. +This attribute controls the length of conflict markers left in the work tree file during a conflicted merge\&. Only a positive integer has a meaningful effect\&. .sp For example, this line in \fB\&.gitattributes\fR can be used to tell the merge machinery to leave much longer (instead of the usual 7\-character\-long) conflict markers when merging the file \fBDocumentation/git\-merge\&.txt\fR results in a conflict\&. .sp diff --git a/man5/gitformat-bundle.5 b/man5/gitformat-bundle.5 index 0b47fd01c..a48bdba2b 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITFORMAT\-BUNDLE" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITFORMAT\-BUNDLE" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-chunk.5 b/man5/gitformat-chunk.5 index 406a25181..aace46c6b 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITFORMAT\-CHUNK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITFORMAT\-CHUNK" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-commit-graph.5 b/man5/gitformat-commit-graph.5 index 60e36a58d..0991b5d8b 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-index.5 b/man5/gitformat-index.5 index b85384fee..943e395b7 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITFORMAT\-INDEX" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITFORMAT\-INDEX" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5 index b93426393..89b35fe88 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITFORMAT\-PACK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITFORMAT\-PACK" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-signature.5 b/man5/gitformat-signature.5 index 1eebcffba..bdc612271 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITFORMAT\-SIGNATURE" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITFORMAT\-SIGNATURE" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/githooks.5 b/man5/githooks.5 index ecba0554f..f78c06904 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITHOOKS" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITHOOKS" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitignore.5 b/man5/gitignore.5 index 4a828d086..89209dfb4 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITIGNORE" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITIGNORE" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5 index e936410ca..fddfc5fff 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITMAILMAP" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITMAILMAP" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmodules.5 b/man5/gitmodules.5 index da531a5a2..46bddd5e4 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITMODULES" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITMODULES" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-capabilities.5 b/man5/gitprotocol-capabilities.5 index 2686dad7f..424ba8d5c 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-common.5 b/man5/gitprotocol-common.5 index 99d4fbec9..e6dc24aed 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITPROTOCOL\-COMMON" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITPROTOCOL\-COMMON" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-http.5 b/man5/gitprotocol-http.5 index 809b6a181..cecd9bdec 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITPROTOCOL\-HTTP" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITPROTOCOL\-HTTP" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-pack.5 b/man5/gitprotocol-pack.5 index 28d7b1543..44c9d95a4 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITPROTOCOL\-PACK" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITPROTOCOL\-PACK" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-v2.5 b/man5/gitprotocol-v2.5 index d32c0f725..e5bbe9d8c 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITPROTOCOL\-V2" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITPROTOCOL\-V2" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5 index 8c678fe8c..e24a90648 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5 index b45ef2f11..6c3bd6320 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-23 +.\" Date: 2023-10-29 .\" Manual: Git Manual -.\" Source: Git 2.42.0.482.g2e8e77cbac +.\" Source: Git 2.42.0.526.g3130c155df .\" Language: English .\" -.TH "GITWEB\&.CONF" "5" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" +.TH "GITWEB\&.CONF" "5" "2023\-10\-29" "Git 2\&.42\&.0\&.526\&.g3130c1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |