diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 15:32:43 -0800 |
| commit | 39ad9ae4c376385ff34f46c8fe23ece001bf0b8c (patch) | |
| tree | 1cc3829be334c1f2a314836da0490aa1da7d8c49 | |
| parent | b0c299ae890b363ec7623a71d0bd7af61ea218e3 (diff) | |
| download | git-manpages-39ad9ae4c376385ff34f46c8fe23ece001bf0b8c.tar.gz | |
Autogenerated manpages for v2.30.0-335-ge63628
179 files changed, 1687 insertions, 913 deletions
diff --git a/man1/git-add.1 b/man1/git-add.1 index 96c6c4ef3..5e7352973 100644 --- a/man1/git-add.1 +++ b/man1/git-add.1 @@ -2,12 +2,12 @@ .\" Title: git-add .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-ADD" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-ADD" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-am.1 b/man1/git-am.1 index bfc98c264..a2bf3ddbf 100644 --- a/man1/git-am.1 +++ b/man1/git-am.1 @@ -2,12 +2,12 @@ .\" Title: git-am .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-AM" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-AM" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index 3423a43c8..0c0dd8208 100644 --- a/man1/git-annotate.1 +++ b/man1/git-annotate.1 @@ -2,12 +2,12 @@ .\" Title: git-annotate .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 488311922..e1bf585a0 100644 --- a/man1/git-apply.1 +++ b/man1/git-apply.1 @@ -2,12 +2,12 @@ .\" Title: git-apply .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-APPLY" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-APPLY" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index aa0a2783b..aabe34312 100644 --- a/man1/git-archimport.1 +++ b/man1/git-archimport.1 @@ -2,12 +2,12 @@ .\" Title: git-archimport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 41eb0c8d3..1320cf263 100644 --- a/man1/git-archive.1 +++ b/man1/git-archive.1 @@ -2,12 +2,12 @@ .\" Title: git-archive .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index 981833700..f65b6542a 100644 --- a/man1/git-bisect.1 +++ b/man1/git-bisect.1 @@ -2,12 +2,12 @@ .\" Title: git-bisect .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-BISECT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-BISECT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index e1fb172ae..954a92929 100644 --- a/man1/git-blame.1 +++ b/man1/git-blame.1 @@ -2,12 +2,12 @@ .\" Title: git-blame .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-BLAME" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-BLAME" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -604,127 +604,7 @@ For people who do parsing: to make it more robust, just ignore any lines between .RE .SH "MAPPING AUTHORS" .sp -If the file \fB\&.mailmap\fR exists at the toplevel of the repository, or at the location pointed to by the mailmap\&.file or mailmap\&.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses\&. -.sp -In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by \fI<\fR and \fI>\fR) to map to the name\&. For example: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -The more complex forms are: -.sp -.if n \{\ -.RS 4 -.\} -.nf -<proper@email\&.xx> <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace only the email part of a commit, and: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <proper@email\&.xx> <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <proper@email\&.xx> Commit Name <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address\&. -.sp -Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Joe Developer <joe@example\&.com> -Joe R\&. Developer <joe@example\&.com> -Jane Doe <jane@example\&.com> -Jane Doe <jane@laptop\&.(none)> -Jane D\&. <jane@desktop\&.(none)> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out\&. A proper \fB\&.mailmap\fR file would look like: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Jane Doe <jane@desktop\&.(none)> -Joe R\&. Developer <joe@example\&.com> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Note how there is no need for an entry for \fB<jane@laptop\&.(none)>\fR, because the real name of that author is already correct\&. -.sp -Example 2: Your repository contains commits from the following authors: -.sp -.if n \{\ -.RS 4 -.\} -.nf -nick1 <bugs@company\&.xx> -nick2 <bugs@company\&.xx> -nick2 <nick2@company\&.xx> -santa <me@company\&.xx> -claus <me@company\&.xx> -CTO <cto@coompany\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Then you might want a \fB\&.mailmap\fR file that looks like: -.sp -.if n \{\ -.RS 4 -.\} -.nf -<cto@company\&.xx> <cto@coompany\&.xx> -Some Dude <some@dude\&.xx> nick1 <bugs@company\&.xx> -Other Author <other@author\&.xx> nick2 <bugs@company\&.xx> -Other Author <other@author\&.xx> <nick2@company\&.xx> -Santa Claus <santa\&.claus@northpole\&.xx> <me@company\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Use hash \fI#\fR for comments that are either on their own line, or after the email address\&. +See \fBgitmailmap\fR(5)\&. .SH "SEE ALSO" .sp \fBgit-annotate\fR(1) diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 9975379c2..9e0941f21 100644 --- a/man1/git-branch.1 +++ b/man1/git-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-branch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-BRANCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index e32266ddf..80dc93a95 100644 --- a/man1/git-bugreport.1 +++ b/man1/git-bugreport.1 @@ -2,12 +2,12 @@ .\" Title: git-bugreport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index 2980b9b11..a64b51dc6 100644 --- a/man1/git-bundle.1 +++ b/man1/git-bundle.1 @@ -2,12 +2,12 @@ .\" Title: git-bundle .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-BUNDLE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index 5c5fcd13e..47c339fb7 100644 --- a/man1/git-cat-file.1 +++ b/man1/git-cat-file.1 @@ -2,12 +2,12 @@ .\" Title: git-cat-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 6b2542a80..786824d48 100644 --- a/man1/git-check-attr.1 +++ b/man1/git-check-attr.1 @@ -2,12 +2,12 @@ .\" Title: git-check-attr .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index c3ad1bde6..d4e0726cc 100644 --- a/man1/git-check-ignore.1 +++ b/man1/git-check-ignore.1 @@ -2,12 +2,12 @@ .\" Title: git-check-ignore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index 0dba91128..e5ed9061b 100644 --- a/man1/git-check-mailmap.1 +++ b/man1/git-check-mailmap.1 @@ -2,12 +2,12 @@ .\" Title: git-check-mailmap .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -47,129 +47,12 @@ Read contacts, one per line, from the standard input after exhausting contacts p .SH "OUTPUT" .sp For each contact, a single line is output, terminated by a newline\&. If the name is provided or known to the \fImailmap\fR, \(lqName <user@host>\(rq is printed; otherwise only \(lq<user@host>\(rq is printed\&. -.SH "MAPPING AUTHORS" -.sp -If the file \fB\&.mailmap\fR exists at the toplevel of the repository, or at the location pointed to by the mailmap\&.file or mailmap\&.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses\&. -.sp -In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by \fI<\fR and \fI>\fR) to map to the name\&. For example: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -The more complex forms are: -.sp -.if n \{\ -.RS 4 -.\} -.nf -<proper@email\&.xx> <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace only the email part of a commit, and: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <proper@email\&.xx> <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <proper@email\&.xx> Commit Name <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address\&. -.sp -Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Joe Developer <joe@example\&.com> -Joe R\&. Developer <joe@example\&.com> -Jane Doe <jane@example\&.com> -Jane Doe <jane@laptop\&.(none)> -Jane D\&. <jane@desktop\&.(none)> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out\&. A proper \fB\&.mailmap\fR file would look like: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Jane Doe <jane@desktop\&.(none)> -Joe R\&. Developer <joe@example\&.com> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Note how there is no need for an entry for \fB<jane@laptop\&.(none)>\fR, because the real name of that author is already correct\&. -.sp -Example 2: Your repository contains commits from the following authors: -.sp -.if n \{\ -.RS 4 -.\} -.nf -nick1 <bugs@company\&.xx> -nick2 <bugs@company\&.xx> -nick2 <nick2@company\&.xx> -santa <me@company\&.xx> -claus <me@company\&.xx> -CTO <cto@coompany\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Then you might want a \fB\&.mailmap\fR file that looks like: -.sp -.if n \{\ -.RS 4 -.\} -.nf -<cto@company\&.xx> <cto@coompany\&.xx> -Some Dude <some@dude\&.xx> nick1 <bugs@company\&.xx> -Other Author <other@author\&.xx> nick2 <bugs@company\&.xx> -Other Author <other@author\&.xx> <nick2@company\&.xx> -Santa Claus <santa\&.claus@northpole\&.xx> <me@company\&.xx> -.fi -.if n \{\ -.RE -.\} +.SH "CONFIGURATION" .sp +See \fBmailmap\&.file\fR and \fBmailmap\&.blob\fR in \fBgit-config\fR(1) for how to specify a custom \fB\&.mailmap\fR target file or object\&. +.SH "MAPPING AUTHORS" .sp -Use hash \fI#\fR for comments that are either on their own line, or after the email address\&. +See \fBgitmailmap\fR(5)\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index a49840f29..dd71b3890 100644 --- a/man1/git-check-ref-format.1 +++ b/man1/git-check-ref-format.1 @@ -2,12 +2,12 @@ .\" Title: git-check-ref-format .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FOR" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHECK\-REF\-FOR" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 22ee1e5cd..05cc68839 100644 --- a/man1/git-checkout-index.1 +++ b/man1/git-checkout-index.1 @@ -2,12 +2,12 @@ .\" Title: git-checkout-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index d13cb72f9..898592396 100644 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.1 @@ -2,12 +2,12 @@ .\" Title: git-checkout .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 186af2c6e..8218cff31 100644 --- a/man1/git-cherry-pick.1 +++ b/man1/git-cherry-pick.1 @@ -2,12 +2,12 @@ .\" Title: git-cherry-pick .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index 25a5c55c1..59ff1cd7e 100644 --- a/man1/git-cherry.1 +++ b/man1/git-cherry.1 @@ -2,12 +2,12 @@ .\" Title: git-cherry .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CHERRY" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index 028d38bca..7543b2c93 100644 --- a/man1/git-citool.1 +++ b/man1/git-citool.1 @@ -2,12 +2,12 @@ .\" Title: git-citool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CITOOL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index 188812365..6c1a01254 100644 --- a/man1/git-clean.1 +++ b/man1/git-clean.1 @@ -2,12 +2,12 @@ .\" Title: git-clean .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CLEAN" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clone.1 b/man1/git-clone.1 index be499beae..de8a276f0 100644 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -2,12 +2,12 @@ .\" Title: git-clone .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CLONE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CLONE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -64,6 +64,11 @@ If the repository is specified as a local path (e\&.g\&., will override the default when \fB/path/to/repo\fR is given, using the regular Git transport instead\&. +.sp +\fBNOTE\fR: this operation can race with concurrent modification to the source repository, similar to running +\fBcp \-r src dst\fR +while modifying +\fBsrc\fR\&. .RE .PP \-\-no\-hardlinks diff --git a/man1/git-column.1 b/man1/git-column.1 index 23bf299e8..c57e3d1c2 100644 --- a/man1/git-column.1 +++ b/man1/git-column.1 @@ -2,12 +2,12 @@ .\" Title: git-column .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-COLUMN" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index bd1538730..f57547680 100644 --- a/man1/git-commit-graph.1 +++ b/man1/git-commit-graph.1 @@ -2,12 +2,12 @@ .\" Title: git-commit-graph .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 929c55a72..51b05eaf5 100644 --- a/man1/git-commit-tree.1 +++ b/man1/git-commit-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-commit-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 6fd2a4f65..112b9c7d7 100644 --- a/man1/git-commit.1 +++ b/man1/git-commit.1 @@ -2,12 +2,12 @@ .\" Title: git-commit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-COMMIT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-config.1 b/man1/git-config.1 index 9471bb1c5..1d68e24b5 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,12 +2,12 @@ .\" Title: git-config .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CONFIG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -550,6 +550,14 @@ for details\&. .RE .sp See also the section called \(lqFILES\(rq\&. +.PP +GIT_CONFIG_COUNT, GIT_CONFIG_KEY_<n>, GIT_CONFIG_VALUE_<n> +.RS 4 +If GIT_CONFIG_COUNT is set to a positive number, all environment pairs GIT_CONFIG_KEY_<n> and GIT_CONFIG_VALUE_<n> up to that number will be added to the process\(cqs runtime configuration\&. The config pairs are zero\-indexed\&. Any missing key or value is treated as an error\&. An empty GIT_CONFIG_COUNT is treated the same as GIT_CONFIG_COUNT=0, namely no pairs are processed\&. These environment variables will override values in configuration files, but will be overridden by any explicit options passed via +\fBgit \-c\fR\&. +.sp +This is useful for cases where you want to spawn multiple git commands with a common configuration but cannot depend on a configuration file, for example when writing scripts\&. +.RE .SH "EXAMPLES" .sp Given a \&.git/config like this: @@ -3297,7 +3305,7 @@ when \fBstatus\&.submoduleSummary\fR is set unless it is overridden by using the \-\-ignore\-submodules command\-line option\&. The \fIgit submodule\fR -commands are not affected by this setting\&. +commands are not affected by this setting\&. By default this is set to untracked so that any untracked submodules are ignored\&. .RE .PP diff\&.mnemonicPrefix @@ -3461,6 +3469,28 @@ when the \-g/\-\-gui flag is specified\&. This variable overrides the value conf .sp -1 .IP \(bu 2.3 .\} +araxis +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +bc +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} bc3 .RE .sp @@ -3472,6 +3502,105 @@ bc3 .sp -1 .IP \(bu 2.3 .\} +bc4 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +codecompare +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +deltawalker +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +diffmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +diffuse +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +ecmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +emerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +examdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +guiffy +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} gvimdiff .RE .sp @@ -3505,6 +3634,39 @@ gvimdiff3 .sp -1 .IP \(bu 2.3 .\} +kdiff3 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +kompare +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +meld +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} nvimdiff .RE .sp @@ -3527,6 +3689,72 @@ nvimdiff2 .sp -1 .IP \(bu 2.3 .\} +nvimdiff3 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +opendiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +p4merge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +smerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +tkdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +vimdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} vimdiff2 .RE .sp @@ -3540,6 +3768,28 @@ vimdiff2 .\} vimdiff3 .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +winmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +xxdiff +.RE .RE .PP diff\&.indentHeuristic @@ -5850,6 +6100,28 @@ when the \-g/\-\-gui flag is specified\&. The list below shows the valid built\- .sp -1 .IP \(bu 2.3 .\} +araxis +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +bc +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} bc3 .RE .sp @@ -5861,6 +6133,105 @@ bc3 .sp -1 .IP \(bu 2.3 .\} +bc4 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +codecompare +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +deltawalker +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +diffmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +diffuse +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +ecmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +emerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +examdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +guiffy +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} gvimdiff .RE .sp @@ -5894,6 +6265,28 @@ gvimdiff3 .sp -1 .IP \(bu 2.3 .\} +kdiff3 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +meld +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} nvimdiff .RE .sp @@ -5916,6 +6309,83 @@ nvimdiff2 .sp -1 .IP \(bu 2.3 .\} +nvimdiff3 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +opendiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +p4merge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +smerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +tkdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +tortoisemerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +vimdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} vimdiff2 .RE .sp @@ -5929,6 +6399,28 @@ vimdiff2 .\} vimdiff3 .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +winmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +xxdiff +.RE .RE .PP merge\&.verbosity diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index 551c8314d..0d293a5c8 100644 --- a/man1/git-count-objects.1 +++ b/man1/git-count-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-count-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index baa8f4533..8ac07da78 100644 --- a/man1/git-credential-cache--daemon.1 +++ b/man1/git-credential-cache--daemon.1 @@ -2,12 +2,12 @@ .\" Title: git-credential-cache--daemon .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CREDENTIAL\-CAC" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index 7dad1a922..0e7f27d20 100644 --- a/man1/git-credential-cache.1 +++ b/man1/git-credential-cache.1 @@ -2,12 +2,12 @@ .\" Title: git-credential-cache .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CREDENTIAL\-CAC" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index be3886b3c..d7ccd5d2c 100644 --- a/man1/git-credential-store.1 +++ b/man1/git-credential-store.1 @@ -2,12 +2,12 @@ .\" Title: git-credential-store .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STO" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CREDENTIAL\-STO" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential.1 b/man1/git-credential.1 index 0457b58dc..dde3614f4 100644 --- a/man1/git-credential.1 +++ b/man1/git-credential.1 @@ -2,12 +2,12 @@ .\" Title: git-credential .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index 47fd29a92..d37db09b2 100644 --- a/man1/git-cvsexportcommit.1 +++ b/man1/git-cvsexportcommit.1 @@ -2,12 +2,12 @@ .\" Title: git-cvsexportcommit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 1574f6732..6a1e290ac 100644 --- a/man1/git-cvsimport.1 +++ b/man1/git-cvsimport.1 @@ -2,12 +2,12 @@ .\" Title: git-cvsimport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index bed16b33d..95e3a93ee 100644 --- a/man1/git-cvsserver.1 +++ b/man1/git-cvsserver.1 @@ -2,12 +2,12 @@ .\" Title: git-cvsserver .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 0f849ab35..3692442f2 100644 --- a/man1/git-daemon.1 +++ b/man1/git-daemon.1 @@ -2,12 +2,12 @@ .\" Title: git-daemon .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DAEMON" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-describe.1 b/man1/git-describe.1 index 7072dba33..d4e49d455 100644 --- a/man1/git-describe.1 +++ b/man1/git-describe.1 @@ -2,12 +2,12 @@ .\" Title: git-describe .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index df063f4c9..5eb47acca 100644 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.1 @@ -2,12 +2,12 @@ .\" Title: git-diff-files .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index be10c620b..66db416e9 100644 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.1 @@ -2,12 +2,12 @@ .\" Title: git-diff-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 944c42747..b1a3a6d4d 100644 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-diff-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 600fe33eb..287fc29b3 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-diff .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DIFF" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DIFF" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index bcf6c1b0f..c371ab6bd 100644 --- a/man1/git-difftool.1 +++ b/man1/git-difftool.1 @@ -2,12 +2,12 @@ .\" Title: git-difftool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index e14337bed..2dd8ef8f0 100644 --- a/man1/git-fast-export.1 +++ b/man1/git-fast-export.1 @@ -2,12 +2,12 @@ .\" Title: git-fast-export .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index e20c60d70..b413157bf 100644 --- a/man1/git-fast-import.1 +++ b/man1/git-fast-import.1 @@ -2,12 +2,12 @@ .\" Title: git-fast-import .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index c69fda70b..4f740e588 100644 --- a/man1/git-fetch-pack.1 +++ b/man1/git-fetch-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-fetch-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index db66563c4..31b04a355 100644 --- a/man1/git-fetch.1 +++ b/man1/git-fetch.1 @@ -2,12 +2,12 @@ .\" Title: git-fetch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FETCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FETCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -64,6 +64,11 @@ Append ref names and object names of fetched refs to the existing contents of will be overwritten\&. .RE .PP +\-\-atomic +.RS 4 +Use an atomic transaction to update local refs\&. Either all refs are updated, or on error, no refs are updated\&. +.RE +.PP \-\-depth=<depth> .RS 4 Limit fetching to the specified number of commits from the tip of each remote branch history\&. If fetching to a diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index 2aedc932f..46bee686d 100644 --- a/man1/git-filter-branch.1 +++ b/man1/git-filter-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-filter-branch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index f9959a8dd..a1b0cad50 100644 --- a/man1/git-fmt-merge-msg.1 +++ b/man1/git-fmt-merge-msg.1 @@ -2,12 +2,12 @@ .\" Title: git-fmt-merge-msg .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index 78a4a40e7..3016b77b4 100644 --- a/man1/git-for-each-ref.1 +++ b/man1/git-for-each-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-for-each-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 30676833c..cf80c2a43 100644 --- a/man1/git-for-each-repo.1 +++ b/man1/git-for-each-repo.1 @@ -2,12 +2,12 @@ .\" Title: git-for-each-repo .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index 4359dcab7..3dff1f826 100644 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.1 @@ -2,12 +2,12 @@ .\" Title: git-format-patch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index 3661c71d8..8e5d046a1 100644 --- a/man1/git-fsck-objects.1 +++ b/man1/git-fsck-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-fsck-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index fd6b041fe..58ba195a8 100644 --- a/man1/git-fsck.1 +++ b/man1/git-fsck.1 @@ -2,12 +2,12 @@ .\" Title: git-fsck .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-FSCK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-FSCK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 8607c64b3..f17ba9f4f 100644 --- a/man1/git-gc.1 +++ b/man1/git-gc.1 @@ -2,12 +2,12 @@ .\" Title: git-gc .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-GC" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-GC" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1 index b053af104..b3cfcaf7d 100644 --- a/man1/git-get-tar-commit-id.1 +++ b/man1/git-get-tar-commit-id.1 @@ -2,12 +2,12 @@ .\" Title: git-get-tar-commit-id .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMI" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMI" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 81e0da86b..981fe129f 100644 --- a/man1/git-grep.1 +++ b/man1/git-grep.1 @@ -2,12 +2,12 @@ .\" Title: git-grep .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-GREP" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-GREP" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gui.1 b/man1/git-gui.1 index b7d017f75..98cbdb5ce 100644 --- a/man1/git-gui.1 +++ b/man1/git-gui.1 @@ -2,12 +2,12 @@ .\" Title: git-gui .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-GUI" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-GUI" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index c16f4b967..bf3a0aa6f 100644 --- a/man1/git-hash-object.1 +++ b/man1/git-hash-object.1 @@ -2,12 +2,12 @@ .\" Title: git-hash-object .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-help.1 b/man1/git-help.1 index 71c29088c..be049675a 100644 --- a/man1/git-help.1 +++ b/man1/git-help.1 @@ -2,12 +2,12 @@ .\" Title: git-help .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-HELP" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-HELP" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index 3a11984a5..72b1ca617 100644 --- a/man1/git-http-backend.1 +++ b/man1/git-http-backend.1 @@ -2,12 +2,12 @@ .\" Title: git-http-backend .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index 97f5306fd..cbdfd0258 100644 --- a/man1/git-http-fetch.1 +++ b/man1/git-http-fetch.1 @@ -2,12 +2,12 @@ .\" Title: git-http-fetch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index 7d80fcbf8..033134a4a 100644 --- a/man1/git-http-push.1 +++ b/man1/git-http-push.1 @@ -2,12 +2,12 @@ .\" Title: git-http-push .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index 850dcaf79..ed6db83b5 100644 --- a/man1/git-imap-send.1 +++ b/man1/git-imap-send.1 @@ -2,12 +2,12 @@ .\" Title: git-imap-send .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index 1b72e334a..dd73ff2b5 100644 --- a/man1/git-index-pack.1 +++ b/man1/git-index-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-index-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index e67469ad2..58f7e365f 100644 --- a/man1/git-init-db.1 +++ b/man1/git-init-db.1 @@ -2,12 +2,12 @@ .\" Title: git-init-db .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index 113a182db..59b996c40 100644 --- a/man1/git-init.1 +++ b/man1/git-init.1 @@ -2,12 +2,12 @@ .\" Title: git-init .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-INIT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-INIT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index 5b0daaa24..19552b00e 100644 --- a/man1/git-instaweb.1 +++ b/man1/git-instaweb.1 @@ -2,12 +2,12 @@ .\" Title: git-instaweb .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index 4fe637b53..0b46db48c 100644 --- a/man1/git-interpret-trailers.1 +++ b/man1/git-interpret-trailers.1 @@ -2,12 +2,12 @@ .\" Title: git-interpret-trailers .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAI" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-INTERPRET\-TRAI" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-log.1 b/man1/git-log.1 index 0898fc019..5ea8fbae6 100644 --- a/man1/git-log.1 +++ b/man1/git-log.1 @@ -2,12 +2,12 @@ .\" Title: git-log .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-LOG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-LOG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index 07808774e..9f9ef4f86 100644 --- a/man1/git-ls-files.1 +++ b/man1/git-ls-files.1 @@ -2,12 +2,12 @@ .\" Title: git-ls-files .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -47,7 +47,7 @@ git-ls-files \- Show information about files in the index and the working tree .sp .SH "DESCRIPTION" .sp -This merges the file listing in the directory cache index with the actual working directory list, and shows different combinations of the two\&. +This merges the file listing in the index with the actual working directory list, and shows different combinations of the two\&. .sp One or more of the options below may be used to determine the files shown: .SH "OPTIONS" diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index c1016a7a3..a5de70e21 100644 --- a/man1/git-ls-remote.1 +++ b/man1/git-ls-remote.1 @@ -2,12 +2,12 @@ .\" Title: git-ls-remote .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 76700f266..32f313d1c 100644 --- a/man1/git-ls-tree.1 +++ b/man1/git-ls-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-ls-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index db3408eec..2bd9f0190 100644 --- a/man1/git-mailinfo.1 +++ b/man1/git-mailinfo.1 @@ -2,12 +2,12 @@ .\" Title: git-mailinfo .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MAILINFO" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index 9119c1e96..52582062c 100644 --- a/man1/git-mailsplit.1 +++ b/man1/git-mailsplit.1 @@ -2,12 +2,12 @@ .\" Title: git-mailsplit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index db0568df2..74e23ca36 100644 --- a/man1/git-maintenance.1 +++ b/man1/git-maintenance.1 @@ -2,12 +2,12 @@ .\" Title: git-maintenance .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -288,6 +288,73 @@ The background maintenance schedule runs \fBgit maintenance run\fR processes on If you find that some maintenance windows are taking longer than one hour to complete, then consider reducing the complexity of your maintenance tasks\&. For example, the \fBgc\fR task is much slower than the \fBincremental\-repack\fR task\&. However, this comes at a cost of a slightly larger object database\&. Consider moving more expensive tasks to be run less frequently\&. .sp Expert users may consider scheduling their own maintenance tasks using a different schedule than is available through \fBgit maintenance start\fR and Git configuration options\&. These users should be aware of the object database lock and how concurrent \fBgit maintenance run\fR commands behave\&. Further, the \fBgit gc\fR command should not be combined with \fBgit maintenance run\fR commands\&. \fBgit gc\fR modifies the object database but does not take the lock in the same way as \fBgit maintenance run\fR\&. If possible, use \fBgit maintenance run \-\-task=gc\fR instead of \fBgit gc\fR\&. +.sp +The following sections describe the mechanisms put in place to run background maintenance by \fBgit maintenance start\fR and how to customize them\&. +.SH "BACKGROUND MAINTENANCE ON POSIX SYSTEMS" +.sp +The standard mechanism for scheduling background tasks on POSIX systems is cron(8)\&. This tool executes commands based on a given schedule\&. The current list of user\-scheduled tasks can be found by running \fBcrontab \-l\fR\&. The schedule written by \fBgit maintenance start\fR is similar to this: +.sp +.if n \{\ +.RS 4 +.\} +.nf +# BEGIN GIT MAINTENANCE SCHEDULE +# The following schedule was created by Git +# Any edits made in this region might be +# replaced in the future by a Git command\&. + +0 1\-23 * * * "/<path>/git" \-\-exec\-path="/<path>" for\-each\-repo \-\-config=maintenance\&.repo maintenance run \-\-schedule=hourly +0 0 * * 1\-6 "/<path>/git" \-\-exec\-path="/<path>" for\-each\-repo \-\-config=maintenance\&.repo maintenance run \-\-schedule=daily +0 0 * * 0 "/<path>/git" \-\-exec\-path="/<path>" for\-each\-repo \-\-config=maintenance\&.repo maintenance run \-\-schedule=weekly + +# END GIT MAINTENANCE SCHEDULE +.fi +.if n \{\ +.RE +.\} +.sp +.sp +The comments are used as a region to mark the schedule as written by Git\&. Any modifications within this region will be completely deleted by \fBgit maintenance stop\fR or overwritten by \fBgit maintenance start\fR\&. +.sp +The \fBcrontab\fR entry specifies the full path of the \fBgit\fR executable to ensure that the executed \fBgit\fR command is the same one with which \fBgit maintenance start\fR was issued independent of \fBPATH\fR\&. If the same user runs \fBgit maintenance start\fR with multiple Git executables, then only the latest executable is used\&. +.sp +These commands use \fBgit for\-each\-repo \-\-config=maintenance\&.repo\fR to run \fBgit maintenance run \-\-schedule=<frequency>\fR on each repository listed in the multi\-valued \fBmaintenance\&.repo\fR config option\&. These are typically loaded from the user\-specific global config\&. The \fBgit maintenance\fR process then determines which maintenance tasks are configured to run on each repository with each \fB<frequency>\fR using the \fBmaintenance\&.<task>\&.schedule\fR config options\&. These values are loaded from the global or repository config values\&. +.sp +If the config values are insufficient to achieve your desired background maintenance schedule, then you can create your own schedule\&. If you run \fBcrontab \-e\fR, then an editor will load with your user\-specific \fBcron\fR schedule\&. In that editor, you can add your own schedule lines\&. You could start by adapting the default schedule listed earlier, or you could read the crontab(5) documentation for advanced scheduling techniques\&. Please do use the full path and \fB\-\-exec\-path\fR techniques from the default schedule to ensure you are executing the correct binaries in your schedule\&. +.SH "BACKGROUND MAINTENANCE ON MACOS SYSTEMS" +.sp +While macOS technically supports \fBcron\fR, using \fBcrontab \-e\fR requires elevated privileges and the executed process does not have a full user context\&. Without a full user context, Git and its credential helpers cannot access stored credentials, so some maintenance tasks are not functional\&. +.sp +Instead, \fBgit maintenance start\fR interacts with the \fBlaunchctl\fR tool, which is the recommended way to schedule timed jobs in macOS\&. Scheduling maintenance through \fBgit maintenance (start|stop)\fR requires some \fBlaunchctl\fR features available only in macOS 10\&.11 or later\&. +.sp +Your user\-specific scheduled tasks are stored as XML\-formatted \fB\&.plist\fR files in \fB~/Library/LaunchAgents/\fR\&. You can see the currently\-registered tasks using the following command: +.sp +.if n \{\ +.RS 4 +.\} +.nf +$ ls ~/Library/LaunchAgents/org\&.git\-scm\&.git* +org\&.git\-scm\&.git\&.daily\&.plist +org\&.git\-scm\&.git\&.hourly\&.plist +org\&.git\-scm\&.git\&.weekly\&.plist +.fi +.if n \{\ +.RE +.\} +.sp +.sp +One task is registered for each \fB\-\-schedule=<frequency>\fR option\&. To inspect how the XML format describes each schedule, open one of these \fB\&.plist\fR files in an editor and inspect the \fB<array>\fR element following the \fB<key>StartCalendarInterval</key>\fR element\&. +.sp +\fBgit maintenance start\fR will overwrite these files and register the tasks again with \fBlaunchctl\fR, so any customizations should be done by creating your own \fB\&.plist\fR files with distinct names\&. Similarly, the \fBgit maintenance stop\fR command will unregister the tasks with \fBlaunchctl\fR and delete the \fB\&.plist\fR files\&. +.sp +To create more advanced customizations to your background tasks, see launchctl\&.plist(5) for more information\&. +.SH "BACKGROUND MAINTENANCE ON WINDOWS SYSTEMS" +.sp +Windows does not support \fBcron\fR and instead has its own system for scheduling background tasks\&. The \fBgit maintenance start\fR command uses the \fBschtasks\fR command to submit tasks to this system\&. You can inspect all background tasks using the Task Scheduler application\&. The tasks added by Git have names of the form \fBGit Maintenance (<frequency>)\fR\&. The Task Scheduler GUI has ways to inspect these tasks, but you can also export the tasks to XML files and view the details there\&. +.sp +Note that since Git is a console application, these background tasks create a console window visible to the current user\&. This can be changed manually by selecting the "Run whether user is logged in or not" option in Task Scheduler\&. This change requires a password input, which is why \fBgit maintenance start\fR does not select it by default\&. +.sp +If you want to customize the background tasks, please rename the tasks so future calls to \fBgit maintenance (start|stop)\fR do not overwrite your custom tasks\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index 8ddfc1dd4..65eaf4fe9 100644 --- a/man1/git-merge-base.1 +++ b/man1/git-merge-base.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-base .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index a6067a8be..52b9a995b 100644 --- a/man1/git-merge-file.1 +++ b/man1/git-merge-file.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index 4f00b7338..d6ac15a28 100644 --- a/man1/git-merge-index.1 +++ b/man1/git-merge-index.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGE\-INDEX" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1 index 15e6b4fac..5c03ceba0 100644 --- a/man1/git-merge-one-file.1 +++ b/man1/git-merge-one-file.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-one-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGE\-ONE\-FIL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGE\-ONE\-FIL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index a3de84ec9..cb58f18a4 100644 --- a/man1/git-merge-tree.1 +++ b/man1/git-merge-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-merge-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge.1 b/man1/git-merge.1 index d0ccaf73f..bbef8ef75 100644 --- a/man1/git-merge.1 +++ b/man1/git-merge.1 @@ -2,12 +2,12 @@ .\" Title: git-merge .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -985,6 +985,28 @@ when the \-g/\-\-gui flag is specified\&. The list below shows the valid built\- .sp -1 .IP \(bu 2.3 .\} +araxis +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +bc +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} bc3 .RE .sp @@ -996,6 +1018,105 @@ bc3 .sp -1 .IP \(bu 2.3 .\} +bc4 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +codecompare +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +deltawalker +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +diffmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +diffuse +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +ecmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +emerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +examdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +guiffy +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} gvimdiff .RE .sp @@ -1029,6 +1150,28 @@ gvimdiff3 .sp -1 .IP \(bu 2.3 .\} +kdiff3 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +meld +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} nvimdiff .RE .sp @@ -1051,6 +1194,83 @@ nvimdiff2 .sp -1 .IP \(bu 2.3 .\} +nvimdiff3 +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +opendiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +p4merge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +smerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +tkdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +tortoisemerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +vimdiff +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} vimdiff2 .RE .sp @@ -1064,6 +1284,28 @@ vimdiff2 .\} vimdiff3 .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +winmerge +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +xxdiff +.RE .RE .PP merge\&.verbosity diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index 4bc404a9c..d65182309 100644 --- a/man1/git-mergetool--lib.1 +++ b/man1/git-mergetool--lib.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool--lib .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LI" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LI" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 11c182aef..6036596c5 100644 --- a/man1/git-mergetool.1 +++ b/man1/git-mergetool.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktag.1 b/man1/git-mktag.1 index 99b10e907..56ff6f7c5 100644 --- a/man1/git-mktag.1 +++ b/man1/git-mktag.1 @@ -2,12 +2,12 @@ .\" Title: git-mktag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MKTAG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MKTAG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -28,18 +28,56 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -git-mktag \- Creates a tag object +git-mktag \- Creates a tag object with extra validation .SH "SYNOPSIS" .sp .nf \fIgit mktag\fR .fi .sp +.SH "OPTIONS" +.PP +\-\-strict +.RS 4 +By default mktag turns on the equivalent of +\fBgit-fsck\fR(1) +\fB\-\-strict\fR +mode\&. Use +\fB\-\-no\-strict\fR +to disable it\&. +.RE .SH "DESCRIPTION" .sp -Reads a tag contents on standard input and creates a tag object that can also be used to sign other objects\&. +Reads a tag contents on standard input and creates a tag object\&. The output is the new tag\(cqs <object> identifier\&. +.sp +This command is mostly equivalent to \fBgit-hash-object\fR(1) invoked with \fB\-t tag \-w \-\-stdin\fR\&. I\&.e\&. both of these will create and write a tag found in \fBmy\-tag\fR: +.sp +.if n \{\ +.RS 4 +.\} +.nf +git mktag <my\-tag +git hash\-object \-t tag \-w \-\-stdin <my\-tag +.fi +.if n \{\ +.RE +.\} .sp -The output is the new tag\(cqs <object> identifier\&. +The difference is that mktag will die before writing the tag if the tag doesn\(cqt pass a \fBgit-fsck\fR(1) check\&. +.sp +The "fsck" check done mktag is stricter than what \fBgit-fsck\fR(1) would run by default in that all \fBfsck\&.<msg\-id>\fR messages are promoted from warnings to errors (so e\&.g\&. a missing "tagger" line is an error)\&. +.sp +Extra headers in the object are also an error under mktag, but ignored by \fBgit-fsck\fR(1)\&. This extra check can be turned off by setting the appropriate \fBfsck\&.<msg\-id>\fR varible: +.sp +.if n \{\ +.RS 4 +.\} +.nf +git \-c fsck\&.extraHeaderEntry=ignore mktag <my\-tag\-with\-headers +.fi +.if n \{\ +.RE +.\} .SH "TAG FORMAT" .sp A tag signature file, to be fed to this command\(cqs standard input, has a very simple fixed format: four lines of @@ -48,7 +86,7 @@ A tag signature file, to be fed to this command\(cqs standard input, has a very .RS 4 .\} .nf -object <sha1> +object <hash> type <typename> tag <tagname> tagger <tagger> @@ -57,7 +95,7 @@ tagger <tagger> .RE .\} .sp -followed by some \fIoptional\fR free\-form message (some tags created by older Git may not have \fBtagger\fR line)\&. The message, when exists, is separated by a blank line from the header\&. The message part may contain a signature that Git itself doesn\(cqt care about, but that can be verified with gpg\&. +followed by some \fIoptional\fR free\-form message (some tags created by older Git may not have \fBtagger\fR line)\&. The message, when it exists, is separated by a blank line from the header\&. The message part may contain a signature that Git itself doesn\(cqt care about, but that can be verified with gpg\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 index 81841781c..d43f57683 100644 --- a/man1/git-mktree.1 +++ b/man1/git-mktree.1 @@ -2,12 +2,12 @@ .\" Title: git-mktree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MKTREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MKTREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-multi-pack-index.1 b/man1/git-multi-pack-index.1 index 0616a69e7..613817841 100644 --- a/man1/git-multi-pack-index.1 +++ b/man1/git-multi-pack-index.1 @@ -2,12 +2,12 @@ .\" Title: git-multi-pack-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MULTI\-PACK\-IN" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MULTI\-PACK\-IN" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mv.1 b/man1/git-mv.1 index 9002cc6c2..e15a971e2 100644 --- a/man1/git-mv.1 +++ b/man1/git-mv.1 @@ -2,12 +2,12 @@ .\" Title: git-mv .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-MV" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-MV" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index 5eaf1f99f..754823f67 100644 --- a/man1/git-name-rev.1 +++ b/man1/git-name-rev.1 @@ -2,12 +2,12 @@ .\" Title: git-name-rev .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-NAME\-REV" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-NAME\-REV" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-notes.1 b/man1/git-notes.1 index d59931ae3..ba0b26301 100644 --- a/man1/git-notes.1 +++ b/man1/git-notes.1 @@ -2,12 +2,12 @@ .\" Title: git-notes .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-NOTES" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-NOTES" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-p4.1 b/man1/git-p4.1 index 67bba5987..66641ac89 100644 --- a/man1/git-p4.1 +++ b/man1/git-p4.1 @@ -2,12 +2,12 @@ .\" Title: git-p4 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-P4" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-P4" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index 9a48c40cc..d7d1920a3 100644 --- a/man1/git-pack-objects.1 +++ b/man1/git-pack-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-pack-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PACK\-OBJECTS" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index e43bade4f..9b754c8ba 100644 --- a/man1/git-pack-redundant.1 +++ b/man1/git-pack-redundant.1 @@ -2,12 +2,12 @@ .\" Title: git-pack-redundant .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PACK\-REDUNDANT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PACK\-REDUNDANT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1 index 04e864ac3..bb8a5b203 100644 --- a/man1/git-pack-refs.1 +++ b/man1/git-pack-refs.1 @@ -2,12 +2,12 @@ .\" Title: git-pack-refs .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PACK\-REFS" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PACK\-REFS" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1 index 26fdb8100..033dc3b33 100644 --- a/man1/git-patch-id.1 +++ b/man1/git-patch-id.1 @@ -2,12 +2,12 @@ .\" Title: git-patch-id .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PATCH\-ID" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PATCH\-ID" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1 index f257b3c07..af651a056 100644 --- a/man1/git-prune-packed.1 +++ b/man1/git-prune-packed.1 @@ -2,12 +2,12 @@ .\" Title: git-prune-packed .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PRUNE\-PACKED" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PRUNE\-PACKED" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune.1 b/man1/git-prune.1 index 1249700bc..62cd3bc98 100644 --- a/man1/git-prune.1 +++ b/man1/git-prune.1 @@ -2,12 +2,12 @@ .\" Title: git-prune .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PRUNE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PRUNE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pull.1 b/man1/git-pull.1 index 74346aad9..b6da8d71a 100644 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -2,12 +2,12 @@ .\" Title: git-pull .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PULL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PULL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -337,6 +337,11 @@ Append ref names and object names of fetched refs to the existing contents of will be overwritten\&. .RE .PP +\-\-atomic +.RS 4 +Use an atomic transaction to update local refs\&. Either all refs are updated, or on error, no refs are updated\&. +.RE +.PP \-\-depth=<depth> .RS 4 Limit fetching to the specified number of commits from the tip of each remote branch history\&. If fetching to a diff --git a/man1/git-push.1 b/man1/git-push.1 index 3421c0398..d086ed50c 100644 --- a/man1/git-push.1 +++ b/man1/git-push.1 @@ -2,12 +2,12 @@ .\" Title: git-push .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-PUSH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-PUSH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-quiltimport.1 b/man1/git-quiltimport.1 index 28829e60a..6efc906f3 100644 --- a/man1/git-quiltimport.1 +++ b/man1/git-quiltimport.1 @@ -2,12 +2,12 @@ .\" Title: git-quiltimport .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-QUILTIMPORT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-QUILTIMPORT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-range-diff.1 b/man1/git-range-diff.1 index 36db2d116..6c5bb878a 100644 --- a/man1/git-range-diff.1 +++ b/man1/git-range-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-range-diff .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-RANGE\-DIFF" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-RANGE\-DIFF" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index b432a30e6..d1c31733f 100644 --- a/man1/git-read-tree.1 +++ b/man1/git-read-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-read-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-READ\-TREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 2e7ab7fe1..957c224a6 100644 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -2,12 +2,12 @@ .\" Title: git-rebase .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REBASE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REBASE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index c189430ae..84710ed90 100644 --- a/man1/git-receive-pack.1 +++ b/man1/git-receive-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-receive-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-RECEIVE\-PACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-RECEIVE\-PACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index 1a09ee0e9..e9444a4fe 100644 --- a/man1/git-reflog.1 +++ b/man1/git-reflog.1 @@ -2,12 +2,12 @@ .\" Title: git-reflog .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REFLOG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REFLOG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-ext.1 b/man1/git-remote-ext.1 index f26bd271a..f58cce70a 100644 --- a/man1/git-remote-ext.1 +++ b/man1/git-remote-ext.1 @@ -2,12 +2,12 @@ .\" Title: git-remote-ext .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REMOTE\-EXT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REMOTE\-EXT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-fd.1 b/man1/git-remote-fd.1 index eb9d67dcf..160ae1e45 100644 --- a/man1/git-remote-fd.1 +++ b/man1/git-remote-fd.1 @@ -2,12 +2,12 @@ .\" Title: git-remote-fd .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REMOTE\-FD" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REMOTE\-FD" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote.1 b/man1/git-remote.1 index abd39f3e4..20e7f3440 100644 --- a/man1/git-remote.1 +++ b/man1/git-remote.1 @@ -2,12 +2,12 @@ .\" Title: git-remote .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REMOTE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REMOTE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-repack.1 b/man1/git-repack.1 index e4fd321ab..e714e7dfc 100644 --- a/man1/git-repack.1 +++ b/man1/git-repack.1 @@ -2,12 +2,12 @@ .\" Title: git-repack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REPACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REPACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-replace.1 b/man1/git-replace.1 index 8a6dd53d7..72f0c9669 100644 --- a/man1/git-replace.1 +++ b/man1/git-replace.1 @@ -2,12 +2,12 @@ .\" Title: git-replace .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REPLACE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REPLACE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-request-pull.1 b/man1/git-request-pull.1 index b2994a16f..841c9209f 100644 --- a/man1/git-request-pull.1 +++ b/man1/git-request-pull.1 @@ -2,12 +2,12 @@ .\" Title: git-request-pull .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REQUEST\-PULL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REQUEST\-PULL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rerere.1 b/man1/git-rerere.1 index 6f70aef05..fd82b7d64 100644 --- a/man1/git-rerere.1 +++ b/man1/git-rerere.1 @@ -2,12 +2,12 @@ .\" Title: git-rerere .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-RERERE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-RERERE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reset.1 b/man1/git-reset.1 index ece1405a1..b26552bde 100644 --- a/man1/git-reset.1 +++ b/man1/git-reset.1 @@ -2,12 +2,12 @@ .\" Title: git-reset .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-RESET" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-RESET" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-restore.1 b/man1/git-restore.1 index 44e43c756..1f92dc4e4 100644 --- a/man1/git-restore.1 +++ b/man1/git-restore.1 @@ -2,12 +2,12 @@ .\" Title: git-restore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-RESTORE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-RESTORE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index 70048fa1d..bea0e3159 100644 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.1 @@ -2,12 +2,12 @@ .\" Title: git-rev-list .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REV\-LIST" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index f78f22ba0..93e842417 100644 --- a/man1/git-rev-parse.1 +++ b/man1/git-rev-parse.1 @@ -2,12 +2,12 @@ .\" Title: git-rev-parse .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REV\-PARSE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REV\-PARSE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-revert.1 b/man1/git-revert.1 index 463cd1d6b..b4bf0c5c2 100644 --- a/man1/git-revert.1 +++ b/man1/git-revert.1 @@ -2,12 +2,12 @@ .\" Title: git-revert .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-REVERT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-REVERT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rm.1 b/man1/git-rm.1 index 0bd5d9ba9..2f8796bc5 100644 --- a/man1/git-rm.1 +++ b/man1/git-rm.1 @@ -2,12 +2,12 @@ .\" Title: git-rm .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-RM" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-RM" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 31975d67d..a6cce873a 100644 --- a/man1/git-send-email.1 +++ b/man1/git-send-email.1 @@ -2,12 +2,12 @@ .\" Title: git-send-email .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SEND\-EMAIL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -833,7 +833,9 @@ To use \fIgit send\-email\fR to send your patches through the GMail SMTP server, .\} .sp .sp -If you have multifactor authentication setup on your gmail account, you will need to generate an app\-specific password for use with \fIgit send\-email\fR\&. Visit \m[blue]\fBhttps://security\&.google\&.com/settings/security/apppasswords\fR\m[] to create it\&. +If you have multi\-factor authentication set up on your Gmail account, you will need to generate an app\-specific password for use with \fIgit send\-email\fR\&. Visit \m[blue]\fBhttps://security\&.google\&.com/settings/security/apppasswords\fR\m[] to create it\&. +.sp +If you do not have multi\-factor authentication set up on your Gmail account, you will need to allow less secure app access\&. Visit \m[blue]\fBhttps://myaccount\&.google\&.com/lesssecureapps\fR\m[] to enable it\&. .sp Once your commits are ready to be sent to the mailing list, run the following commands: .sp diff --git a/man1/git-send-pack.1 b/man1/git-send-pack.1 index 7c97b1b89..12cc42d77 100644 --- a/man1/git-send-pack.1 +++ b/man1/git-send-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-send-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SEND\-PACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SEND\-PACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n--envsubst.1 b/man1/git-sh-i18n--envsubst.1 index 548ee009e..50ec309e9 100644 --- a/man1/git-sh-i18n--envsubst.1 +++ b/man1/git-sh-i18n--envsubst.1 @@ -2,12 +2,12 @@ .\" Title: git-sh-i18n--envsubst .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SH\-I18N\-\-ENV" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SH\-I18N\-\-ENV" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n.1 b/man1/git-sh-i18n.1 index 5f5649c35..69c8a2123 100644 --- a/man1/git-sh-i18n.1 +++ b/man1/git-sh-i18n.1 @@ -2,12 +2,12 @@ .\" Title: git-sh-i18n .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SH\-I18N" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SH\-I18N" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-setup.1 b/man1/git-sh-setup.1 index 7ef717a0d..a6d338fe4 100644 --- a/man1/git-sh-setup.1 +++ b/man1/git-sh-setup.1 @@ -2,12 +2,12 @@ .\" Title: git-sh-setup .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SH\-SETUP" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SH\-SETUP" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shell.1 b/man1/git-shell.1 index 0d059c6fd..bb99b994d 100644 --- a/man1/git-shell.1 +++ b/man1/git-shell.1 @@ -2,12 +2,12 @@ .\" Title: git-shell .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SHELL" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SHELL" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index 75eac16da..9eeb582fe 100644 --- a/man1/git-shortlog.1 +++ b/man1/git-shortlog.1 @@ -2,12 +2,12 @@ .\" Title: git-shortlog .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SHORTLOG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1320,129 +1320,7 @@ into the main branch\&. The \fB\-\-simplify\-by\-decoration\fR option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags\&. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line\&. All other commits are marked as TREESAME (subject to be simplified away)\&. .SH "MAPPING AUTHORS" .sp -The \fB\&.mailmap\fR feature is used to coalesce together commits by the same person in the shortlog, where their name and/or email address was spelled differently\&. -.sp -If the file \fB\&.mailmap\fR exists at the toplevel of the repository, or at the location pointed to by the mailmap\&.file or mailmap\&.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses\&. -.sp -In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by \fI<\fR and \fI>\fR) to map to the name\&. For example: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -The more complex forms are: -.sp -.if n \{\ -.RS 4 -.\} -.nf -<proper@email\&.xx> <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace only the email part of a commit, and: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <proper@email\&.xx> <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Proper Name <proper@email\&.xx> Commit Name <commit@email\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address\&. -.sp -Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Joe Developer <joe@example\&.com> -Joe R\&. Developer <joe@example\&.com> -Jane Doe <jane@example\&.com> -Jane Doe <jane@laptop\&.(none)> -Jane D\&. <jane@desktop\&.(none)> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out\&. A proper \fB\&.mailmap\fR file would look like: -.sp -.if n \{\ -.RS 4 -.\} -.nf -Jane Doe <jane@desktop\&.(none)> -Joe R\&. Developer <joe@example\&.com> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Note how there is no need for an entry for \fB<jane@laptop\&.(none)>\fR, because the real name of that author is already correct\&. -.sp -Example 2: Your repository contains commits from the following authors: -.sp -.if n \{\ -.RS 4 -.\} -.nf -nick1 <bugs@company\&.xx> -nick2 <bugs@company\&.xx> -nick2 <nick2@company\&.xx> -santa <me@company\&.xx> -claus <me@company\&.xx> -CTO <cto@coompany\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Then you might want a \fB\&.mailmap\fR file that looks like: -.sp -.if n \{\ -.RS 4 -.\} -.nf -<cto@company\&.xx> <cto@coompany\&.xx> -Some Dude <some@dude\&.xx> nick1 <bugs@company\&.xx> -Other Author <other@author\&.xx> nick2 <bugs@company\&.xx> -Other Author <other@author\&.xx> <nick2@company\&.xx> -Santa Claus <santa\&.claus@northpole\&.xx> <me@company\&.xx> -.fi -.if n \{\ -.RE -.\} -.sp -.sp -Use hash \fI#\fR for comments that are either on their own line, or after the email address\&. +See \fBgitmailmap\fR(5)\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 056c61883..b5a455c2e 100644 --- a/man1/git-show-branch.1 +++ b/man1/git-show-branch.1 @@ -2,12 +2,12 @@ .\" Title: git-show-branch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SHOW\-BRANCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SHOW\-BRANCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-index.1 b/man1/git-show-index.1 index d5be066a7..ebe5bbae1 100644 --- a/man1/git-show-index.1 +++ b/man1/git-show-index.1 @@ -2,12 +2,12 @@ .\" Title: git-show-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SHOW\-INDEX" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SHOW\-INDEX" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-ref.1 b/man1/git-show-ref.1 index 549e96343..c9322c871 100644 --- a/man1/git-show-ref.1 +++ b/man1/git-show-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-show-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SHOW\-REF" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SHOW\-REF" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show.1 b/man1/git-show.1 index b14a0c3f4..2e7e6c751 100644 --- a/man1/git-show.1 +++ b/man1/git-show.1 @@ -2,12 +2,12 @@ .\" Title: git-show .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SHOW" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SHOW" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sparse-checkout.1 b/man1/git-sparse-checkout.1 index b8e3f0220..1ab4c9d62 100644 --- a/man1/git-sparse-checkout.1 +++ b/man1/git-sparse-checkout.1 @@ -2,12 +2,12 @@ .\" Title: git-sparse-checkout .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SPARSE\-CHECKOU" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SPARSE\-CHECKOU" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stage.1 b/man1/git-stage.1 index f800bd8fa..060bbf0fb 100644 --- a/man1/git-stage.1 +++ b/man1/git-stage.1 @@ -2,12 +2,12 @@ .\" Title: git-stage .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-STAGE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-STAGE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stash.1 b/man1/git-stash.1 index 674c31bad..1c7759817 100644 --- a/man1/git-stash.1 +++ b/man1/git-stash.1 @@ -2,12 +2,12 @@ .\" Title: git-stash .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-STASH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-STASH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-status.1 b/man1/git-status.1 index 8f2b240eb..f5a409cd1 100644 --- a/man1/git-status.1 +++ b/man1/git-status.1 @@ -2,12 +2,12 @@ .\" Title: git-status .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-STATUS" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-STATUS" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -272,7 +272,62 @@ where \fBORIG_PATH\fR is where the renamed/copied contents came from\&. \fBORIG_ .sp The fields (including the \fB\->\fR) are separated from each other by a single space\&. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash\-escaped\&. .sp -For paths with merge conflicts, \fBX\fR and \fBY\fR show the modification states of each side of the merge\&. For paths that do not have merge conflicts, \fBX\fR shows the status of the index, and \fBY\fR shows the status of the work tree\&. For untracked paths, \fBXY\fR are \fB??\fR\&. Other status codes can be interpreted as follows: +There are three different types of states that are shown using this format, and each one uses the \fBXY\fR syntax differently: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +When a merge is occurring and the merge was successful, or outside of a merge situation, +\fBX\fR +shows the status of the index and +\fBY\fR +shows the status of the working tree\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +When a merge conflict has occurred and has not yet been resolved, +\fBX\fR +and +\fBY\fR +show the state introduced by each head of the merge, relative to the common ancestor\&. These paths are said to be +\fIunmerged\fR\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +When a path is untracked, +\fBX\fR +and +\fBY\fR +are always the same, since they are unknown to the index\&. +\fB??\fR +is used for untracked paths\&. Ignored files are not listed unless +\fB\-\-ignored\fR +is used; if it is, ignored files are indicated by +\fB!!\fR\&. +.RE +.sp +Note that the term \fImerge\fR here also includes rebases using the default \fB\-\-merge\fR strategy, cherry\-picks, and anything else using the merge machinery\&. +.sp +In the following table, these three classes are shown in separate sections, and these characters are used for \fBX\fR and \fBY\fR fields for the first two sections that show tracked paths: .sp .RS 4 .ie n \{\ @@ -357,8 +412,6 @@ For paths with merge conflicts, \fBX\fR and \fBY\fR show the modification states = updated but unmerged .RE .sp -Ignored files are not listed, unless \fB\-\-ignored\fR option is in effect, in which case \fBXY\fR are \fB!!\fR\&. -.sp .if n \{\ .RS 4 .\} diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1 index d3aa09518..f3e1b98a6 100644 --- a/man1/git-stripspace.1 +++ b/man1/git-stripspace.1 @@ -2,12 +2,12 @@ .\" Title: git-stripspace .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-STRIPSPACE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-STRIPSPACE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-submodule.1 b/man1/git-submodule.1 index 88fc4c857..a9c4d2c20 100644 --- a/man1/git-submodule.1 +++ b/man1/git-submodule.1 @@ -2,12 +2,12 @@ .\" Title: git-submodule .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SUBMODULE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SUBMODULE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-svn.1 b/man1/git-svn.1 index baac05dc5..280e1363f 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -2,12 +2,12 @@ .\" Title: git-svn .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SVN" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SVN" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-switch.1 b/man1/git-switch.1 index 8ecd86b27..445bf3827 100644 --- a/man1/git-switch.1 +++ b/man1/git-switch.1 @@ -2,12 +2,12 @@ .\" Title: git-switch .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SWITCH" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SWITCH" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index 62858ef02..53b536b14 100644 --- a/man1/git-symbolic-ref.1 +++ b/man1/git-symbolic-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-symbolic-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-SYMBOLIC\-REF" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-SYMBOLIC\-REF" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-tag.1 b/man1/git-tag.1 index 9615282d8..9107b8ef0 100644 --- a/man1/git-tag.1 +++ b/man1/git-tag.1 @@ -2,12 +2,12 @@ .\" Title: git-tag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-TAG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-TAG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-file.1 b/man1/git-unpack-file.1 index b7c1d8950..b86281d14 100644 --- a/man1/git-unpack-file.1 +++ b/man1/git-unpack-file.1 @@ -2,12 +2,12 @@ .\" Title: git-unpack-file .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UNPACK\-FILE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UNPACK\-FILE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1 index eb237e184..cd3337480 100644 --- a/man1/git-unpack-objects.1 +++ b/man1/git-unpack-objects.1 @@ -2,12 +2,12 @@ .\" Title: git-unpack-objects .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UNPACK\-OBJECTS" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UNPACK\-OBJECTS" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index a9596f520..2b811b3c4 100644 --- a/man1/git-update-index.1 +++ b/man1/git-update-index.1 @@ -2,12 +2,12 @@ .\" Title: git-update-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -54,7 +54,7 @@ git-update-index \- Register file contents in the working tree to the index .sp .SH "DESCRIPTION" .sp -Modifies the index or directory cache\&. Each file mentioned is updated into the index and any \fIunmerged\fR or \fIneeds updating\fR state is cleared\&. +Modifies the index\&. Each file mentioned is updated into the index and any \fIunmerged\fR or \fIneeds updating\fR state is cleared\&. .sp See also \fBgit-add\fR(1) for a more user\-friendly way to do some of the most common operations on the index\&. .sp diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1 index 8c512d156..87108fa51 100644 --- a/man1/git-update-ref.1 +++ b/man1/git-update-ref.1 @@ -2,12 +2,12 @@ .\" Title: git-update-ref .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UPDATE\-REF" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UPDATE\-REF" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-server-info.1 b/man1/git-update-server-info.1 index aec53b3a7..9ea0a1f71 100644 --- a/man1/git-update-server-info.1 +++ b/man1/git-update-server-info.1 @@ -2,12 +2,12 @@ .\" Title: git-update-server-info .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UPDATE\-SERVER\" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UPDATE\-SERVER\" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-archive.1 b/man1/git-upload-archive.1 index 73627c2d3..d0933f17d 100644 --- a/man1/git-upload-archive.1 +++ b/man1/git-upload-archive.1 @@ -2,12 +2,12 @@ .\" Title: git-upload-archive .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UPLOAD\-ARCHIVE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UPLOAD\-ARCHIVE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1 index 4e8bc911d..224e0a9c5 100644 --- a/man1/git-upload-pack.1 +++ b/man1/git-upload-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-upload-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-UPLOAD\-PACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-UPLOAD\-PACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-var.1 b/man1/git-var.1 index 3c6e10bdc..21efaa0b4 100644 --- a/man1/git-var.1 +++ b/man1/git-var.1 @@ -2,12 +2,12 @@ .\" Title: git-var .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-VAR" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-VAR" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-commit.1 b/man1/git-verify-commit.1 index 110904d37..08b8e4693 100644 --- a/man1/git-verify-commit.1 +++ b/man1/git-verify-commit.1 @@ -2,12 +2,12 @@ .\" Title: git-verify-commit .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-VERIFY\-COMMIT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-VERIFY\-COMMIT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1 index 1ce64f611..df9d386e3 100644 --- a/man1/git-verify-pack.1 +++ b/man1/git-verify-pack.1 @@ -2,12 +2,12 @@ .\" Title: git-verify-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-VERIFY\-PACK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-VERIFY\-PACK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-tag.1 b/man1/git-verify-tag.1 index dbe11c57c..b23749d1b 100644 --- a/man1/git-verify-tag.1 +++ b/man1/git-verify-tag.1 @@ -2,12 +2,12 @@ .\" Title: git-verify-tag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-VERIFY\-TAG" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-VERIFY\-TAG" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-web--browse.1 b/man1/git-web--browse.1 index b18bce277..0821c5550 100644 --- a/man1/git-web--browse.1 +++ b/man1/git-web--browse.1 @@ -2,12 +2,12 @@ .\" Title: git-web--browse .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-WEB\-\-BROWSE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-WEB\-\-BROWSE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1 index 0574ee69b..293c1d680 100644 --- a/man1/git-whatchanged.1 +++ b/man1/git-whatchanged.1 @@ -2,12 +2,12 @@ .\" Title: git-whatchanged .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-WHATCHANGED" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-WHATCHANGED" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-worktree.1 b/man1/git-worktree.1 index 04a0d8edd..c3099e777 100644 --- a/man1/git-worktree.1 +++ b/man1/git-worktree.1 @@ -2,12 +2,12 @@ .\" Title: git-worktree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-WORKTREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-WORKTREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1 index a21df2b47..145478e8b 100644 --- a/man1/git-write-tree.1 +++ b/man1/git-write-tree.1 @@ -2,12 +2,12 @@ .\" Title: git-write-tree .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT\-WRITE\-TREE" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT\-WRITE\-TREE" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git.1 b/man1/git.1 index 443b38068..8c570fe8e 100644 --- a/man1/git.1 +++ b/man1/git.1 @@ -2,12 +2,12 @@ .\" Title: git .\" Author: [see the "Authors" section] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GIT" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GIT" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -36,7 +36,7 @@ git \- the stupid content tracker [\-\-exec\-path[=<path>]] [\-\-html\-path] [\-\-man\-path] [\-\-info\-path] [\-p|\-\-paginate|\-P|\-\-no\-pager] [\-\-no\-replace\-objects] [\-\-bare] [\-\-git\-dir=<path>] [\-\-work\-tree=<path>] [\-\-namespace=<name>] - [\-\-super\-prefix=<path>] + [\-\-super\-prefix=<path>] [\-\-config\-env <name>=<envvar>] <command> [<args>] .fi .sp @@ -131,6 +131,30 @@ will convert to \fBfalse\fR\&. .RE .PP +\-\-config\-env=<name>=<envvar> +.RS 4 +Like +\fB\-c <name>=<value>\fR, give configuration variable +\fI<name>\fR +a value, where <envvar> is the name of an environment variable from which to retrieve the value\&. Unlike +\fB\-c\fR +there is no shortcut for directly setting the value to an empty string, instead the environment variable itself must be set to the empty string\&. It is an error if the +\fB<envvar>\fR +does not exist in the environment\&. +\fB<envvar>\fR +may not contain an equals sign to avoid ambiguity with `<name>`s which contain one\&. +.sp +This is useful for cases where you want to pass transitory configuration options to git, but are doing so on OS\(cqs where other processes might be able to read your cmdline (e\&.g\&. +\fB/proc/self/cmdline\fR), but not your environ (e\&.g\&. +\fB/proc/self/environ\fR)\&. That behavior is the default on Linux, but may not be on your system\&. +.sp +Note that this might add security for variables such as +\fBhttp\&.extraHeader\fR +where the sensitive information is part of the value, but not e\&.g\&. +\fBurl\&.<base>\&.insteadOf\fR +where the sensitive information can be part of the key\&. +.RE +.PP \-\-exec\-path[=<path>] .RS 4 Path to wherever your core Git programs are installed\&. This can also be controlled by setting the GIT_EXEC_PATH environment variable\&. If no path is given, @@ -773,7 +797,7 @@ Run a merge for files needing merging\&. .PP \fBgit-mktag\fR(1) .RS 4 -Creates a tag object\&. +Creates a tag object with extra validation\&. .RE .PP \fBgit-mktree\fR(1) @@ -1138,6 +1162,11 @@ Hooks used by Git\&. Specifies intentionally untracked files to ignore\&. .RE .PP +\fBgitmailmap\fR(5) +.RS 4 +Map author/committer names and/or E\-Mail addresses\&. +.RE +.PP \fBgitmodules\fR(5) .RS 4 Defining submodule properties\&. diff --git a/man1/gitk.1 b/man1/gitk.1 index 4554229a4..55155583b 100644 --- a/man1/gitk.1 +++ b/man1/gitk.1 @@ -2,12 +2,12 @@ .\" Title: gitk .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITK" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITK" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitweb.1 b/man1/gitweb.1 index eb0c41257..24adcdd7c 100644 --- a/man1/gitweb.1 +++ b/man1/gitweb.1 @@ -2,12 +2,12 @@ .\" Title: gitweb .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITWEB" "1" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITWEB" "1" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index 83e6cd246..bdadd1ffe 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: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITATTRIBUTES" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/githooks.5 b/man5/githooks.5 index 4e99953be..52ee35a44 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: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITHOOKS" "5" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITHOOKS" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitignore.5 b/man5/gitignore.5 index 33bbd5a9c..118cdea71 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: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITIGNORE" "5" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITIGNORE" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5 new file mode 100644 index 000000000..32727b9f9 --- /dev/null +++ b/man5/gitmailmap.5 @@ -0,0 +1,195 @@ +'\" t +.\" Title: gitmailmap +.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 01/25/2021 +.\" Manual: Git Manual +.\" Source: Git 2.30.0.335.ge6362826a0 +.\" Language: English +.\" +.TH "GITMAILMAP" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +gitmailmap \- Map author/committer names and/or E\-Mail addresses +.SH "SYNOPSIS" +.sp +$GIT_WORK_TREE/\&.mailmap +.SH "DESCRIPTION" +.sp +If the file \fB\&.mailmap\fR exists at the toplevel of the repository, or at the location pointed to by the \fBmailmap\&.file\fR or \fBmailmap\&.blob\fR configuration options (see \fBgit-config\fR(1)), it is used to map author and committer names and email addresses to canonical real names and email addresses\&. +.SH "SYNTAX" +.sp +The \fI#\fR character begins a comment to the end of line, blank lines are ignored\&. +.sp +In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by \fI<\fR and \fI>\fR) to map to the name\&. For example: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Proper Name <commit@email\&.xx> +.fi +.if n \{\ +.RE +.\} +.sp +The more complex forms are: +.sp +.if n \{\ +.RS 4 +.\} +.nf +<proper@email\&.xx> <commit@email\&.xx> +.fi +.if n \{\ +.RE +.\} +.sp +which allows mailmap to replace only the email part of a commit, and: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Proper Name <proper@email\&.xx> <commit@email\&.xx> +.fi +.if n \{\ +.RE +.\} +.sp +which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Proper Name <proper@email\&.xx> Commit Name <commit@email\&.xx> +.fi +.if n \{\ +.RE +.\} +.sp +which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address\&. +.sp +Both E\-Mails and names are matched case\-insensitively\&. For example this would also match the \fICommit Name <\fR\fI\m[blue]\fBcommit@email\&.xx\fR\m[]\&\s-2\u[1]\d\s+2\fR\fI>\fR above: +.sp +Proper Name <\m[blue]\fBproper@email\&.xx\fR\m[]\&\s-2\u[2]\d\s+2> CoMmIt NaMe <\m[blue]\fBCoMmIt@EmAiL\&.xX\fR\m[]\&\s-2\u[3]\d\s+2> +.SH "EXAMPLES" +.sp +Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Joe Developer <joe@example\&.com> +Joe R\&. Developer <joe@example\&.com> +Jane Doe <jane@example\&.com> +Jane Doe <jane@laptop\&.(none)> +Jane D\&. <jane@desktop\&.(none)> +.fi +.if n \{\ +.RE +.\} +.sp +.sp +Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out\&. A \fB\&.mailmap\fR file to correct the names would look like: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Joe R\&. Developer <joe@example\&.com> +Jane Doe <jane@example\&.com> +Jane Doe <jane@desktop\&.(none)> +.fi +.if n \{\ +.RE +.\} +.sp +.sp +Note that there\(cqs no need to map the name for \fIjane@laptop\&.(none)\fR to only correct the names\&. However, leaving the obviously broken \fB<jane@laptop\&.(none)>\(aq and \(aq<jane@desktop\&.(none)>\(aq E\-Mails as\-is is usually not what you want\&. A `\&.mailmap\fR file which also corrects those is: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Joe R\&. Developer <joe@example\&.com> +Jane Doe <jane@example\&.com> <jane@laptop\&.(none)> +Jane Doe <jane@example\&.com> <jane@desktop\&.(none)> +.fi +.if n \{\ +.RE +.\} +.sp +.sp +Finally, let\(cqs say that Joe and Jane shared an E\-Mail address, but not a name, e\&.g\&. by having these two commits in the history generated by a bug reporting system\&. I\&.e\&. names appearing in history as: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Joe <bugs@example\&.com> +Jane <bugs@example\&.com> +.fi +.if n \{\ +.RE +.\} +.sp +.sp +A full \fB\&.mailmap\fR file which also handles those cases (an addition of two lines to the above example) would be: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Joe R\&. Developer <joe@example\&.com> +Jane Doe <jane@example\&.com> <jane@laptop\&.(none)> +Jane Doe <jane@example\&.com> <jane@desktop\&.(none)> +Joe R\&. Developer <joe@example\&.com> Joe <bugs@example\&.com> +Jane Doe <jane@example\&.com> Jane <bugs@example\&.com> +.fi +.if n \{\ +.RE +.\} +.sp +.SH "SEE ALSO" +.sp +\fBgit-check-mailmap\fR(1) +.SH "GIT" +.sp +Part of the \fBgit\fR(1) suite +.SH "NOTES" +.IP " 1." 4 +commit@email.xx +.RS 4 +\%mailto:commit@email.xx +.RE +.IP " 2." 4 +proper@email.xx +.RS 4 +\%mailto:proper@email.xx +.RE +.IP " 3." 4 +CoMmIt@EmAiL.xX +.RS 4 +\%mailto:CoMmIt@EmAiL.xX +.RE diff --git a/man5/gitmodules.5 b/man5/gitmodules.5 index 7e669cfb6..756f30584 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: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITMODULES" "5" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITMODULES" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5 index d7e6ba1d6..f9a82c77b 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: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITREPOSITORY\-LAYOU" "5" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITREPOSITORY\-LAYOU" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5 index f79be02c2..026440659 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: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITWEB\&.CONF" "5" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITWEB\&.CONF" "5" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcli.7 b/man7/gitcli.7 index 409d8158e..74f46e48c 100644 --- a/man7/gitcli.7 +++ b/man7/gitcli.7 @@ -2,12 +2,12 @@ .\" Title: gitcli .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITCLI" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITCLI" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcore-tutorial.7 b/man7/gitcore-tutorial.7 index d952eb98a..7caca9ad4 100644 --- a/man7/gitcore-tutorial.7 +++ b/man7/gitcore-tutorial.7 @@ -2,12 +2,12 @@ .\" Title: gitcore-tutorial .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITCORE\-TUTORIAL" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITCORE\-TUTORIAL" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcredentials.7 b/man7/gitcredentials.7 index 76ca46753..6a1714c09 100644 --- a/man7/gitcredentials.7 +++ b/man7/gitcredentials.7 @@ -2,12 +2,12 @@ .\" Title: gitcredentials .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITCREDENTIALS" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITCREDENTIALS" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcvs-migration.7 b/man7/gitcvs-migration.7 index 32fe5f522..0cc9eef36 100644 --- a/man7/gitcvs-migration.7 +++ b/man7/gitcvs-migration.7 @@ -2,12 +2,12 @@ .\" Title: gitcvs-migration .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITCVS\-MIGRATION" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITCVS\-MIGRATION" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitdiffcore.7 b/man7/gitdiffcore.7 index 4e33dd3aa..69f178f90 100644 --- a/man7/gitdiffcore.7 +++ b/man7/gitdiffcore.7 @@ -2,12 +2,12 @@ .\" Title: gitdiffcore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITDIFFCORE" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITDIFFCORE" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/giteveryday.7 b/man7/giteveryday.7 index 75b4e94ab..e591e512b 100644 --- a/man7/giteveryday.7 +++ b/man7/giteveryday.7 @@ -2,12 +2,12 @@ .\" Title: giteveryday .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITEVERYDAY" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITEVERYDAY" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitfaq.7 b/man7/gitfaq.7 index e50a1cbfc..819bae430 100644 --- a/man7/gitfaq.7 +++ b/man7/gitfaq.7 @@ -2,12 +2,12 @@ .\" Title: gitfaq .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITFAQ" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITFAQ" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index 669b7611e..de2e5ab59 100644 --- a/man7/gitglossary.7 +++ b/man7/gitglossary.7 @@ -2,12 +2,12 @@ .\" Title: gitglossary .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITGLOSSARY" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITGLOSSARY" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitnamespaces.7 b/man7/gitnamespaces.7 index 63179bab2..344836e1f 100644 --- a/man7/gitnamespaces.7 +++ b/man7/gitnamespaces.7 @@ -2,12 +2,12 @@ .\" Title: gitnamespaces .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITNAMESPACES" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITNAMESPACES" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitremote-helpers.7 b/man7/gitremote-helpers.7 index 458d3e105..1bb34e1b7 100644 --- a/man7/gitremote-helpers.7 +++ b/man7/gitremote-helpers.7 @@ -2,12 +2,12 @@ .\" Title: gitremote-helpers .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITREMOTE\-HELPERS" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITREMOTE\-HELPERS" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitrevisions.7 b/man7/gitrevisions.7 index 07a26fc6e..db4904579 100644 --- a/man7/gitrevisions.7 +++ b/man7/gitrevisions.7 @@ -2,12 +2,12 @@ .\" Title: gitrevisions .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITREVISIONS" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITREVISIONS" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitsubmodules.7 b/man7/gitsubmodules.7 index 819231d68..9603dc61d 100644 --- a/man7/gitsubmodules.7 +++ b/man7/gitsubmodules.7 @@ -2,12 +2,12 @@ .\" Title: gitsubmodules .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITSUBMODULES" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITSUBMODULES" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial-2.7 b/man7/gittutorial-2.7 index 5d188a69f..302bb5891 100644 --- a/man7/gittutorial-2.7 +++ b/man7/gittutorial-2.7 @@ -2,12 +2,12 @@ .\" Title: gittutorial-2 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITTUTORIAL\-2" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITTUTORIAL\-2" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial.7 b/man7/gittutorial.7 index dac70ef69..d510bd748 100644 --- a/man7/gittutorial.7 +++ b/man7/gittutorial.7 @@ -2,12 +2,12 @@ .\" Title: gittutorial .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITTUTORIAL" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITTUTORIAL" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitworkflows.7 b/man7/gitworkflows.7 index d542a7365..8a53c24a7 100644 --- a/man7/gitworkflows.7 +++ b/man7/gitworkflows.7 @@ -2,12 +2,12 @@ .\" Title: gitworkflows .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 01/15/2021 +.\" Date: 01/25/2021 .\" Manual: Git Manual -.\" Source: Git 2.30.0.122.g4151fdb1c7 +.\" Source: Git 2.30.0.335.ge6362826a0 .\" Language: English .\" -.TH "GITWORKFLOWS" "7" "01/15/2021" "Git 2\&.30\&.0\&.122\&.g4151fd" "Git Manual" +.TH "GITWORKFLOWS" "7" "01/25/2021" "Git 2\&.30\&.0\&.335\&.ge63628" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |