diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-23 13:26:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-23 13:26:33 -0700 |
| commit | e67960dbfdfac9175908225753fa664b7d019704 (patch) | |
| tree | b62fafb5947b7888ed341a6fcdf3bd4de5f4ca22 | |
| parent | ad6c9c582ae0ff68603df6c3f7e3049a277ccaa6 (diff) | |
| download | git-manpages-e67960dbfdfac9175908225753fa664b7d019704.tar.gz | |
Autogenerated manpages for v2.41.0-191-g6ff334
195 files changed, 880 insertions, 663 deletions
diff --git a/man1/git-add.1 b/man1/git-add.1 index dd468f05c..62f606ad0 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-ADD" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-ADD" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-am.1 b/man1/git-am.1 index b1c087597..7752a1c34 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-AM" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-AM" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index 8a8a6cdeb..a8e61e617 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 190665a81..a02b986a9 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-APPLY" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-APPLY" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index 1a4fbd3eb..aa234c2aa 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index d33425b58..a3b921f02 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index 90f5ac3f9..57d6570e5 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-BISECT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-BISECT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index 5864e5e49..cb9225f22 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-BLAME" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-BLAME" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 0db011b39..a9b05ddb4 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-BRANCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index f5f3d0355..0469e8ee2 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index 17f28625c..4715a0c28 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-BUNDLE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index c60ebb408..d81b48363 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -37,7 +37,7 @@ git-cat-file \- Provide content or type and size information for repository obje \fIgit cat\-file\fR (\-t | \-s) [\-\-allow\-unknown\-type] <object> \fIgit cat\-file\fR (\-\-batch | \-\-batch\-check | \-\-batch\-command) [\-\-batch\-all\-objects] [\-\-buffer] [\-\-follow\-symlinks] [\-\-unordered] - [\-\-textconv | \-\-filters] [\-z] + [\-\-textconv | \-\-filters] [\-Z] \fIgit cat\-file\fR (\-\-textconv | \-\-filters) [<rev>:<path|tree\-ish> | \-\-path=<path|tree\-ish> <rev>] .fi @@ -422,12 +422,22 @@ symlink 11 .\} .RE .PP +\-Z +.RS 4 +Only meaningful with +\fB\-\-batch\fR, +\fB\-\-batch\-check\fR, or +\fB\-\-batch\-command\fR; input and output is NUL\-delimited instead of newline\-delimited\&. +.RE +.PP \-z .RS 4 Only meaningful with \fB\-\-batch\fR, \fB\-\-batch\-check\fR, or -\fB\-\-batch\-command\fR; input is NUL\-delimited instead of newline\-delimited\&. +\fB\-\-batch\-command\fR; input is NUL\-delimited instead of newline\-delimited\&. This option is deprecated in favor of +\fB\-Z\fR +as the output can otherwise be ambiguous\&. .RE .SH "OUTPUT" .sp @@ -617,6 +627,8 @@ notdir SP <size> LF .sp .sp is printed when, during symlink resolution, a file is used as a directory name\&. +.sp +Alternatively, when \fB\-Z\fR is passed, the line feeds in any of the above examples are replaced with NUL terminators\&. This ensures that output will be parsable if the output itself would contain a linefeed and is thus recommended for scripting purposes\&. .SH "CAVEATS" .sp Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage\&. The size of a packed non\-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack\&. diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 9de1975c9..7171099ca 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index bd3bc09aa..a50427785 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index 3db0791cf..1270ce1c8 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 9cbe2b974..b3f61be6a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 5ad5b276a..c4f415cc1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index 363d16f1b..d2692b27c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 0b3e027d8..430baef87 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index d072b27f4..2ee7fafdb 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CHERRY" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index 9f381930e..f1bd5b865 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CITOOL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index 6caf1d768..70063e6be 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CLEAN" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 30208d3c2..a0f6ceedc 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CLONE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CLONE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-column.1 b/man1/git-column.1 index b904ef71e..b002c880f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-COLUMN" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index 6b7289ad3..f31e14ab9 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 42a36b8ff..7d26e6e2a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 6da29a7e7..2e834da18 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-COMMIT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-config.1 b/man1/git-config.1 index 016780f8d..495e82104 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CONFIG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1022,7 +1022,7 @@ Files included by this option (directly or indirectly) are not allowed to contai .sp Note that unlike other includeIf conditions, resolving this condition relies on information that is not yet known at the point of reading the condition\&. A typical use case is this option being present as a system\-level or global\-level config, and the remote URL being in a local\-level config; hence the need to scan ahead when resolving this condition\&. In order to avoid the chicken\-and\-egg problem in which potentially\-included files can affect whether such files are potentially included, Git breaks the cycle by prohibiting these files from affecting the resolution of these conditions (thus, prohibiting them from declaring remote URLs)\&. .sp -As for the naming of this keyword, it is for forwards compatibiliy with a naming scheme that supports more variable\-based include conditions, but currently Git only supports the exact keyword described above\&. +As for the naming of this keyword, it is for forwards compatibility with a naming scheme that supports more variable\-based include conditions, but currently Git only supports the exact keyword described above\&. .RE .sp A few more notes on matching via \fBgitdir\fR and \fBgitdir/i\fR: @@ -1525,6 +1525,11 @@ diverging .RS 4 Advice shown when a fast\-forward is not possible\&. .RE +.PP +worktreeAddOrphan +.RS 4 +Advice shown when a user tries to create a worktree from an invalid reference, to instruct how to create a new orphan branch instead\&. +.RE .RE .PP core\&.fileMode @@ -4382,6 +4387,18 @@ Enable config options that are new to Git, and are being considered for future d \fBfetch\&.negotiationAlgorithm=skipping\fR may improve fetch negotiation times by skipping more commits at a time, reducing the number of round trips\&. .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fBpack\&.useBitmapBoundaryTraversal=true\fR +may improve bitmap traversal times by walking fewer objects\&. +.RE .RE .PP feature\&.manyFiles @@ -5111,6 +5128,13 @@ and are the commits prior to the amend or rebase occurring\&. Since these change \fBgc\&.reflogExpire\fR\&. .RE .PP +gc\&.recentObjectsHook +.RS 4 +When considering whether or not to remove an object (either when generating a cruft pack or storing unreachable objects as loose), use the shell to execute the specified command(s)\&. Interpret their output as object IDs which Git will consider as "recent", regardless of their age\&. By treating their mtimes as "now", any objects (and their descendants) mentioned in the output will be kept regardless of their true age\&. +.sp +Output must contain exactly one hex object ID per line, and nothing else\&. Objects which cannot be found in the repository are ignored\&. Multiple hooks are supported, but all must exit successfully, else the operation (either generating a cruft pack or unpacking unreachable objects) will be halted\&. +.RE +.PP gc\&.rerereResolved .RS 4 Records of conflicted merge you resolved earlier are kept for this many days when @@ -7427,6 +7451,15 @@ pack\&.useBitmaps When true, git will use pack bitmaps (if available) when packing to stdout (e\&.g\&., during the server side of a fetch)\&. Defaults to true\&. You should not generally need to turn this off unless you are debugging pack bitmaps\&. .RE .PP +pack\&.useBitmapBoundaryTraversal +.RS 4 +When true, Git will use an experimental algorithm for computing reachability queries with bitmaps\&. Instead of building up complete bitmaps for all of the negated tips and then OR\-ing them together, consider negated tips with existing bitmaps as additive (i\&.e\&. OR\-ing them into the result if they exist, ignoring them otherwise), and build up a bitmap at the boundary instead\&. +.sp +When using this algorithm, Git may include too many objects as a result of not opening up trees belonging to certain UNINTERESTING commits\&. This inexactness matches the non\-bitmap traversal algorithm\&. +.sp +In many cases, this can provide a speed\-up over the exact algorithm, particularly when there is poor bitmap coverage of the negated side of the query\&. +.RE +.PP pack\&.useSparse .RS 4 When true, git will default to using the diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index 22d529e12..18a5641c3 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index 8d3f3b8e8..aede02f5a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index f1ca1cf00..9ceedd455 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index 67b84ba73..1cefc2b6c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential.1 b/man1/git-credential.1 index 6e7935dd4..d4b4cd80a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -45,7 +45,7 @@ If the action is \fBfill\fR, git\-credential will attempt to add "username" and .sp If the action is \fBapprove\fR, git\-credential will send the description to any configured credential helpers, which may store the credential for later use\&. .sp -If the action is \fBreject\fR, git\-credential will send the description to any configured credential helpers, which may erase any stored credential matching the description\&. +If the action is \fBreject\fR, git\-credential will send the description to any configured credential helpers, which may erase any stored credentials matching the description\&. .sp If the action is \fBapprove\fR or \fBreject\fR, no output should be emitted\&. .SH "TYPICAL USE OF GIT CREDENTIAL" diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index d3fa09f06..4ecee95ae 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 69ff5d612..355bbb2b1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index 9ee6a6351..6f80ebfb5 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -168,7 +168,7 @@ The format of these files is username followed by the encrypted password, for ex .sp You can use the \fIhtpasswd\fR -facility that comes with Apache to make these files, but only with the \-d option (or \-B if your system suports it)\&. +facility that comes with Apache to make these files, but only with the \-d option (or \-B if your system supports it)\&. .sp Preferably use the system specific utility that manages password hash creation in your platform (e\&.g\&. mkpasswd in Linux, encrypt in OpenBSD or pwhash in NetBSD) and paste it in the right location\&. .sp diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 0c5549283..52a65517c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DAEMON" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-describe.1 b/man1/git-describe.1 index 728928bec..da74b212e 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -146,7 +146,7 @@ v1\&.0\&.4\-14\-g2414721 .sp i\&.e\&. the current head of my "parent" branch is based on v1\&.0\&.4, but since it has a few commits on top of that, describe has added the number of additional commits ("14") and an abbreviated object name for the commit itself ("2414721") at the end\&. .sp -The number of additional commits is the number of commits which would be displayed by "git log v1\&.0\&.4\&.\&.parent"\&. The hash suffix is "\-g" + an unambigous abbreviation for the tip commit of parent (which was \fB2414721b194453f058079d897d13c4e377f92dc6\fR)\&. The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7\&. The "g" prefix stands for "git" and is used to allow describing the version of a software depending on the SCM the software is managed with\&. This is useful in an environment where people may use different SCMs\&. +The number of additional commits is the number of commits which would be displayed by "git log v1\&.0\&.4\&.\&.parent"\&. The hash suffix is "\-g" + an unambiguous abbreviation for the tip commit of parent (which was \fB2414721b194453f058079d897d13c4e377f92dc6\fR)\&. The length of the abbreviation scales as the repository grows, using the approximate number of objects in the repository and a bit of math around the birthday paradox, and defaults to a minimum of 7\&. The "g" prefix stands for "git" and is used to allow describing the version of a software depending on the SCM the software is managed with\&. This is useful in an environment where people may use different SCMs\&. .sp Doing a \fIgit describe\fR on a tag\-name will just show the tag name: .sp @@ -208,7 +208,7 @@ If an exact match was not found, \fIgit describe\fR will walk back through the c If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit\-ish will be selected and output\&. Here fewest commits different is defined as the number of commits which would be shown by \fBgit log tag\&.\&.input\fR will be the smallest number of commits possible\&. .SH "BUGS" .sp -Tree objects as well as tag objects not pointing at commits, cannot be described\&. When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ\-ish>:<path> despite the lightweight tag being favorable\&. +Tree objects as well as tag objects not pointing at commits, cannot be described\&. When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <commit\-ish>:<path> despite the lightweight tag being favorable\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-diagnose.1 b/man1/git-diagnose.1 index 2e7649b50..710900acd 100644 --- a/man1/git-diagnose.1 +++ b/man1/git-diagnose.1 @@ -2,12 +2,12 @@ .\" Title: git-diagnose .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIAGNOSE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIAGNOSE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 56973511c..ddb083bf6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index d14afb6b2..04c3f1e85 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index b9371cba3..cdec8c373 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff.1 b/man1/git-diff.1 index c1085103c..31d59bba0 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIFF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -117,7 +117,7 @@ is equivalent to \fBgit diff $(git merge\-base A B) B\fR\&. You can omit any one of <commit>, which has the same effect as using HEAD instead\&. .RE .sp -Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the \fB\-\-merge\-base\fR case and in the last two forms that use \fB\&.\&.\fR notations, can be any <tree>\&. +Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the \fB\-\-merge\-base\fR case and in the last two forms that use \fB\&.\&.\fR notations, can be any <tree>\&. A tree of interest is the one pointed to by the special ref \fBAUTO_MERGE\fR, which is written by the \fIort\fR merge strategy upon hitting merge conflicts (see \fBgit-merge\fR(1))\&. Comparing the working tree with \fBAUTO_MERGE\fR shows changes you\(cqve made so far to resolve textual conflicts (see the examples below)\&. .sp For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in \fBgitrevisions\fR(7)\&. However, "diff" is about comparing two \fIendpoints\fR, not ranges, and the range notations (\fB<commit>\&.\&.<commit>\fR and \fB<commit>\&.\&.\&.<commit>\fR) do not mean a range as defined in the "SPECIFYING RANGES" section in \fBgitrevisions\fR(7)\&. .PP @@ -2032,6 +2032,7 @@ Various ways to check your working tree $ git diff \fB(1)\fR $ git diff \-\-cached \fB(2)\fR $ git diff HEAD \fB(3)\fR +$ git diff AUTO_MERGE \fB(4)\fR .fi .if n \{\ .RE @@ -2054,6 +2055,9 @@ T} Changes in the working tree since your last commit; what you would be committing if you run \fBgit commit \-a\fR T} +\fB4.\fR\h'-2n':T{ +Changes in the working tree you\(cqve made to resolve textual conflicts so far\&. +T} .TE .RE .PP diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index 02397edd5..c0b791983 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index f79ff5bc4..06799170a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 94acc1267..ec4e0e2c6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index 51bfc84d8..2cba4d59f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index 9ee4c3779..b27506cdd 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FETCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FETCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -787,7 +787,7 @@ You can choose to provide the name of a remote which you had previously configur .\} .sp .sp -The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if muliple urls are defined\&. +The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. .SS "Named file in \fB$GIT_DIR/remotes\fR" .sp You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The URL in this file will be used to access the repository\&. The refspec in this file will be used as default when you do not provide a refspec on the command line\&. This file should have the following format: diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index c4c47789d..82fd8a4e8 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index 5a8405118..a5dfc5954 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index ecfac4a00..abaeb1fa6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 48d369314..39d3c951e 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index 9f4c6804e..767a654f3 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -828,7 +828,7 @@ may produce \fBv4\-0001\-add\-makefile\&.patch\fR file that has "Subject: [PATCH v4 1/20] Add makefile" in it\&. \fB<n>\fR -does not have to be an integer (e\&.g\&. "\-\-reroll\-count=4\&.4", or "\-\-reroll\-count=4rev2" are allowed), but the downside of using such a reroll\-count is that the range\-diff/interdiff with the previous version does not state exactly which version the new interation is compared against\&. +does not have to be an integer (e\&.g\&. "\-\-reroll\-count=4\&.4", or "\-\-reroll\-count=4rev2" are allowed), but the downside of using such a reroll\-count is that the range\-diff/interdiff with the previous version does not state exactly which version the new iteration is compared against\&. .RE .PP \-\-to=<email> diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index a78b60d89..e162bb74b 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index 918893ddf..f94cf6a5c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FSCK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FSCK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsmonitor--daemon.1 b/man1/git-fsmonitor--daemon.1 index 73d50f97d..b96de442b 100644 --- a/man1/git-fsmonitor--daemon.1 +++ b/man1/git-fsmonitor--daemon.1 @@ -2,12 +2,12 @@ .\" Title: git-fsmonitor--daemon .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gc.1 b/man1/git-gc.1 index ff987e8af..e2765eaea 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-GC" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-GC" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -298,6 +298,13 @@ and are the commits prior to the amend or rebase occurring\&. Since these change \fBgc\&.reflogExpire\fR\&. .RE .PP +gc\&.recentObjectsHook +.RS 4 +When considering whether or not to remove an object (either when generating a cruft pack or storing unreachable objects as loose), use the shell to execute the specified command(s)\&. Interpret their output as object IDs which Git will consider as "recent", regardless of their age\&. By treating their mtimes as "now", any objects (and their descendants) mentioned in the output will be kept regardless of their true age\&. +.sp +Output must contain exactly one hex object ID per line, and nothing else\&. Objects which cannot be found in the repository are ignored\&. Multiple hooks are supported, but all must exit successfully, else the operation (either generating a cruft pack or unpacking unreachable objects) will be halted\&. +.RE +.PP gc\&.rerereResolved .RS 4 Records of conflicted merge you resolved earlier are kept for this many days when diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1 index d0d3e1eb3..33295bfb4 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 8b7cb21ed..fa845bb7f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-GREP" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-GREP" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gui.1 b/man1/git-gui.1 index 02cb4f9da..4e3a4866e 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-GUI" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-GUI" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index e5d30974a..9c75dd823 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-help.1 b/man1/git-help.1 index fa4d15009..8599fab92 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-HELP" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-HELP" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hook.1 b/man1/git-hook.1 index c6d861f04..8f2d70005 100644 --- a/man1/git-hook.1 +++ b/man1/git-hook.1 @@ -2,12 +2,12 @@ .\" Title: git-hook .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-HOOK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-HOOK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index 9f9f118c4..de5bd283f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index 23a1cf2e6..5451d956d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index bd8451c5a..f5c55c0cc 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index 9e8e7d23f..69bccfb40 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index b22bbf006..27698123a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index 5f97ca1a7..0cdad0031 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index a493c6b89..f89524c9c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-INIT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-INIT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index 966cb511a..07e0d0c40 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index 9f2539166..8410335b1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,15 +39,33 @@ git-interpret-trailers \- Add or parse structured information in commit messages .sp .SH "DESCRIPTION" .sp -Help parsing or adding \fItrailers\fR lines, that look similar to RFC 822 e\-mail headers, at the end of the otherwise free\-form part of a commit message\&. +Add or parse \fItrailer\fR lines that look similar to RFC 822 e\-mail headers, at the end of the otherwise free\-form part of a commit message\&. For example, in the following commit message +.sp +.if n \{\ +.RS 4 +.\} +.nf +subject + +Lorem ipsum dolor sit amet, consectetur adipiscing elit\&. + +Signed\-off\-by: Alice <alice@example\&.com> +Signed\-off\-by: Bob <bob@example\&.com> +.fi +.if n \{\ +.RE +.\} .sp -This command reads some patches or commit messages from either the <file> arguments or the standard input if no <file> is specified\&. If \fB\-\-parse\fR is specified, the output consists of the parsed trailers\&. .sp -Otherwise, this command applies the arguments passed using the \fB\-\-trailer\fR option, if any, to the commit message part of each input file\&. The result is emitted on the standard output\&. +the last two lines starting with "Signed\-off\-by" are trailers\&. .sp -Some configuration variables control the way the \fB\-\-trailer\fR arguments are applied to each commit message and the way any existing trailer in the commit message is changed\&. They also make it possible to automatically add some trailers\&. +This command reads commit messages from either the <file> arguments or the standard input if no <file> is specified\&. If \fB\-\-parse\fR is specified, the output consists of the parsed trailers\&. Otherwise, this command applies the arguments passed using the \fB\-\-trailer\fR option, if any, to each input file\&. The result is emitted on the standard output\&. .sp -By default, a \fI<token>=<value>\fR or \fI<token>:<value>\fR argument given using \fB\-\-trailer\fR will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer)\&. The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the message like this: +This command can also operate on the output of \fBgit-format-patch\fR(1), which is more elaborate than a plain commit message\&. Namely, such output includes a commit message (as above), a "\-\-\-" divider line, and a patch part\&. For these inputs, the divider and patch parts are not modified by this command and are emitted as is on the output, unless \fB\-\-no\-divider\fR is specified\&. +.sp +Some configuration variables control the way the \fB\-\-trailer\fR arguments are applied to each input and the way any existing trailer in the input is changed\&. They also make it possible to automatically add some trailers\&. +.sp +By default, a \fI<token>=<value>\fR or \fI<token>:<value>\fR argument given using \fB\-\-trailer\fR will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer)\&. The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the output like this: .sp .if n \{\ .RS 4 @@ -60,15 +78,27 @@ token: value .\} .sp .sp -This means that the trimmed <token> and <value> will be separated by \fB\*(Aq: \*(Aq\fR (one colon followed by one space)\&. +This means that the trimmed <token> and <value> will be separated by \fB\*(Aq: \*(Aq\fR (one colon followed by one space)\&. For convenience, the <token> can be a shortened string key (e\&.g\&., "sign") instead of the full string which should appear before the separator on the output (e\&.g\&., "Signed\-off\-by")\&. This can be configured using the \fItrailer\&.<token>\&.key\fR configuration variable\&. +.sp +By default the new trailer will appear at the end of all the existing trailers\&. If there is no existing trailer, the new trailer will appear at the end of the input\&. A blank line will be added before the new trailer if there isn\(cqt one already\&. +.sp +Existing trailers are extracted from the input by looking for a group of one or more lines that (i) is all trailers, or (ii) contains at least one Git\-generated or user\-configured trailer and consists of at least 25% trailers\&. The group must be preceded by one or more empty (or whitespace\-only) lines\&. The group must either be at the end of the input or be the last non\-whitespace lines before a line that starts with \fI\-\-\-\fR (followed by a space or the end of the line)\&. .sp -By default the new trailer will appear at the end of all the existing trailers\&. If there is no existing trailer, the new trailer will appear after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line will be added before the new trailer\&. +When reading trailers, there can be no whitespace before or inside the <token>, but any number of regular space and tab characters are allowed between the <token> and the separator\&. There can be whitespaces before, inside or after the <value>\&. The <value> may be split over multiple lines with each subsequent line starting with at least one whitespace, like the "folding" in RFC 822\&. Example: .sp -Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) is all trailers, or (ii) contains at least one Git\-generated or user\-configured trailer and consists of at least 25% trailers\&. The group must be preceded by one or more empty (or whitespace\-only) lines\&. The group must either be at the end of the message or be the last non\-whitespace lines before a line that starts with \fI\-\-\-\fR (followed by a space or the end of the line)\&. Such three minus signs start the patch part of the message\&. See also \fB\-\-no\-divider\fR below\&. +.if n \{\ +.RS 4 +.\} +.nf +token: This is a very long value, with spaces and + newlines in it\&. +.fi +.if n \{\ +.RE +.\} .sp -When reading trailers, there can be no whitespace before or inside the token, but any number of regular space and tab characters are allowed between the token and the separator\&. There can be whitespaces before, inside or after the value\&. The value may be split over multiple lines with each subsequent line starting with at least one whitespace, like the "folding" in RFC 822\&. .sp -Note that \fItrailers\fR do not follow and are not intended to follow many rules for RFC 822 headers\&. For example they do not follow the encoding rules and probably many other rules\&. +Note that trailers do not follow (nor are they intended to follow) many of the rules for RFC 822 headers\&. For example they do not follow the encoding rule\&. .SH "OPTIONS" .PP \-\-in\-place @@ -78,12 +108,12 @@ Edit the files in place\&. .PP \-\-trim\-empty .RS 4 -If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the resulting message\&. This applies to existing trailers as well as new trailers\&. +If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the output\&. This applies to existing trailers as well as new trailers\&. .RE .PP \-\-trailer <token>[(=|:)<value>] .RS 4 -Specify a (<token>, <value>) pair that should be applied as a trailer to the input messages\&. See the description of this command\&. +Specify a (<token>, <value>) pair that should be applied as a trailer to the inputs\&. See the description of this command\&. .RE .PP \-\-where <placement>, \-\-no\-where @@ -105,7 +135,7 @@ or .PP \-\-if\-exists <action>, \-\-no\-if\-exists .RS 4 -Specify what action will be performed when there is already at least one trailer with the same <token> in the message\&. A setting provided with +Specify what action will be performed when there is already at least one trailer with the same <token> in the input\&. A setting provided with \fI\-\-if\-exists\fR overrides all configuration variables and applies to all \fI\-\-trailer\fR @@ -123,7 +153,7 @@ and .PP \-\-if\-missing <action>, \-\-no\-if\-missing .RS 4 -Specify what action will be performed when there is no other trailer with the same <token> in the message\&. A setting provided with +Specify what action will be performed when there is no other trailer with the same <token> in the input\&. A setting provided with \fI\-\-if\-missing\fR overrides all configuration variables and applies to all \fI\-\-trailer\fR @@ -218,7 +248,7 @@ If it is .PP trailer\&.ifexists .RS 4 -This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the message\&. +This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the input\&. .sp The valid values for this option are: \fBaddIfDifferentNeighbor\fR @@ -233,21 +263,21 @@ With \fBaddIfDifferentNeighbor\fR, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is above or below the line where the new trailer will be added\&. .sp With -\fBaddIfDifferent\fR, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the message\&. +\fBaddIfDifferent\fR, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the input\&. .sp With -\fBadd\fR, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the message\&. +\fBadd\fR, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the input\&. .sp With \fBreplace\fR, an existing trailer with the same <token> will be deleted and the new trailer will be added\&. The deleted trailer will be the closest one (with the same <token>) to the place where the new one will be added\&. .sp With -\fBdoNothing\fR, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the message\&. +\fBdoNothing\fR, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the input\&. .RE .PP trailer\&.ifmissing .RS 4 -This option makes it possible to choose what action will be performed when there is not yet any trailer with the same <token> in the message\&. +This option makes it possible to choose what action will be performed when there is not yet any trailer with the same <token> in the input\&. .sp The valid values for this option are: \fBadd\fR @@ -296,14 +326,11 @@ configuration variable and it overrides what is specified by that option for tra .PP trailer\&.<token>\&.command .RS 4 -This option behaves in the same way as -\fItrailer\&.<token>\&.cmd\fR, except that it doesn\(cqt pass anything as argument to the specified command\&. Instead the first occurrence of substring $ARG is replaced by the value that would be passed as argument\&. +Deprecated in favor of +\fItrailer\&.<token>\&.cmd\fR\&. This option behaves in the same way as +\fItrailer\&.<token>\&.cmd\fR, except that it doesn\(cqt pass anything as argument to the specified command\&. Instead the first occurrence of substring $ARG is replaced by the <value> that would be passed as argument\&. .sp -The -\fItrailer\&.<token>\&.command\fR -option has been deprecated in favor of -\fItrailer\&.<token>\&.cmd\fR -due to the fact that $ARG in the user\(cqs command is only replaced once and that the original way of replacing $ARG is not safe\&. +Note that $ARG in the user\(cqs command is only replaced once and that the original way of replacing $ARG is not safe\&. .sp When both \fItrailer\&.<token>\&.cmd\fR @@ -318,9 +345,9 @@ is ignored\&. .PP trailer\&.<token>\&.cmd .RS 4 -This option can be used to specify a shell command that will be called: once to automatically add a trailer with the specified <token>, and then each time a +This option can be used to specify a shell command that will be called once to automatically add a trailer with the specified <token>, and then called each time a \fI\-\-trailer <token>=<value>\fR -argument to modify the <value> of the trailer that this option would produce\&. +argument is specified to modify the <value> of the trailer that this option would produce\&. .sp When the specified command is first called to add a trailer with the specified <token>, the behavior is as if a special \fI\-\-trailer <token>=<value>\fR @@ -346,7 +373,7 @@ Configure a \fIsign\fR trailer with a \fISigned\-off\-by\fR -key, and then add two of these trailers to a message: +key, and then add two of these trailers to a commit message file: .sp .if n \{\ .RS 4 @@ -356,11 +383,11 @@ $ git config trailer\&.sign\&.key "Signed\-off\-by" $ cat msg\&.txt subject -message +body text $ git interpret\-trailers \-\-trailer \*(Aqsign: Alice <alice@example\&.com>\*(Aq \-\-trailer \*(Aqsign: Bob <bob@example\&.com>\*(Aq <msg\&.txt subject -message +body text Signed\-off\-by: Alice <alice@example\&.com> Signed\-off\-by: Bob <bob@example\&.com> @@ -381,7 +408,7 @@ Signed\-off\-by: Bob <bob@example\&.com> .\} Use the \fB\-\-in\-place\fR -option to edit a message file in place: +option to edit a commit message file in place: .sp .if n \{\ .RS 4 @@ -390,14 +417,14 @@ option to edit a message file in place: $ cat msg\&.txt subject -message +body text Signed\-off\-by: Bob <bob@example\&.com> $ git interpret\-trailers \-\-trailer \*(AqAcked\-by: Alice <alice@example\&.com>\*(Aq \-\-in\-place msg\&.txt $ cat msg\&.txt subject -message +body text Signed\-off\-by: Bob <bob@example\&.com> Acked\-by: Alice <alice@example\&.com> @@ -455,7 +482,7 @@ trailer with a command to automatically add a \*(AqSigned\-off\-by: \*(Aq with t $ cat msg1\&.txt subject -message +body text $ git config trailer\&.sign\&.key "Signed\-off\-by: " $ git config trailer\&.sign\&.ifmissing add $ git config trailer\&.sign\&.ifexists doNothing @@ -463,19 +490,19 @@ $ git config trailer\&.sign\&.cmd \*(Aqecho "$(git config user\&.name) <$(git co $ git interpret\-trailers \-\-trailer sign <msg1\&.txt subject -message +body text Signed\-off\-by: Bob <bob@example\&.com> $ cat msg2\&.txt subject -message +body text Signed\-off\-by: Alice <alice@example\&.com> $ git interpret\-trailers \-\-trailer sign <msg2\&.txt subject -message +body text Signed\-off\-by: Alice <alice@example\&.com> .fi @@ -540,14 +567,14 @@ test \-n "$1" && git log \-\-author="$1" \-\-pretty="%an <%ae>" \-1 || true $ cat msg\&.txt subject -message +body text $ git config trailer\&.help\&.key "Helped\-by: " $ git config trailer\&.help\&.ifExists "addIfDifferentNeighbor" $ git config trailer\&.help\&.cmd "~/bin/glog\-find\-author" $ git interpret\-trailers \-\-trailer="help:Junio" \-\-trailer="help:Couder" <msg\&.txt subject -message +body text Helped\-by: Junio C Hamano <gitster@pobox\&.com> Helped\-by: Christian Couder <christian\&.couder@gmail\&.com> @@ -582,14 +609,14 @@ test \-n "$1" && git log \-\-grep "$1" \-\-pretty=reference \-1 || true $ cat msg\&.txt subject -message +body text $ git config trailer\&.ref\&.key "Reference\-to: " $ git config trailer\&.ref\&.ifExists "replace" $ git config trailer\&.ref\&.cmd "~/bin/glog\-grep" $ git interpret\-trailers \-\-trailer="ref:Add copyright notices\&." <msg\&.txt subject -message +body text Reference\-to: 8bc9a0c769 (Add copyright notices\&., 2005\-04\-07) .fi @@ -618,7 +645,7 @@ trailer with a command to show the subject of a commit that is related, and show $ cat msg\&.txt subject -message +body text see: HEAD~2 $ cat ~/bin/glog\-ref @@ -631,7 +658,7 @@ $ git config trailer\&.see\&.cmd "glog\-ref" $ git interpret\-trailers \-\-trailer=see <msg\&.txt subject -message +body text See\-also: fe3187489d69c4 (subject of related commit) .fi diff --git a/man1/git-log.1 b/man1/git-log.1 index c527126e1..1a97d536d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-LOG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-LOG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index 82b23901f..a70a1671b 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index 87e2ac80a..12d6d2e2d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 803f68c15..3160cbe07 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -157,20 +157,20 @@ from the result being shown\&. It also interpolates \fB%%\fR to \fB%\fR, and -\fB%xx\fR +\fB%xNN\fR where -\fBxx\fR +\fBNN\fR are hex digits interpolates to character with hex code -\fBxx\fR; for example -\fB%00\fR +\fBNN\fR; for example +\fB%x00\fR interpolates to \fB\e0\fR (NUL), -\fB%09\fR +\fB%x09\fR to \fB\et\fR (TAB) and -\fB%0a\fR +\fB%x0a\fR to \fB\en\fR (LF)\&. When specified, @@ -237,7 +237,7 @@ git ls\-tree \-\-format=\*(Aq%(objectname) %(path)\*(Aq <tree\-ish> .\} .SH "FIELD NAMES" .sp -Various values from structured fields can be used to interpolate into the resulting output\&. For each outputing line, the following names can be used: +Various values from structured fields can be used to interpolate into the resulting output\&. For each outputting line, the following names can be used: .PP objectmode .RS 4 diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index 840bd1b16..90232c0e1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MAILINFO" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index c098f7639..1ddaafeed 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index 84fe36cf1..04980f4f5 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index 58690c9f2..22fe007b2 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index efcaae17d..832335cc3 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index 11482ed2d..4ad6948f2 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE\-INDEX" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1 index 0b86ba086..a007d60fd 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE\-ONE\-FILE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE\-ONE\-FILE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index 2f2604e60..2f92eca98 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge.1 b/man1/git-merge.1 index a4fccb93c..79268a84e 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -424,7 +424,7 @@ For conflicting paths, the index file records up to three versions: stage 1 stor \fBHEAD\fR, and stage 3 from \fBMERGE_HEAD\fR (you can inspect the stages with -\fBgit ls\-files \-u\fR)\&. The working tree files contain the result of the "merge" program; i\&.e\&. 3\-way merge results with familiar conflict markers +\fBgit ls\-files \-u\fR)\&. The working tree files contain the result of the merge operation; i\&.e\&. 3\-way merge results with familiar conflict markers \fB<<<\fR \fB===\fR \fB>>>\fR\&. @@ -438,6 +438,21 @@ For conflicting paths, the index file records up to three versions: stage 1 stor .sp -1 .IP " 5." 4.2 .\} +A special ref +\fBAUTO_MERGE\fR +is written, pointing to a tree corresponding to the current content of the working tree (including conflict markers for textual conflicts)\&. Note that this ref is only written when the +\fIort\fR +merge strategy is used (the default)\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04' 6.\h'+01'\c +.\} +.el \{\ +.sp -1 +.IP " 6." 4.2 +.\} No other changes are made\&. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i\&.e\&. matching \fBHEAD\fR\&. .RE @@ -612,6 +627,8 @@ will show a three\-way diff, highlighting changes from both the and \fBMERGE_HEAD\fR versions\&. +\fBgit diff AUTO_MERGE\fR +will show what changes you\(cqve made so far to resolve textual conflicts\&. .RE .sp .RS 4 diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index 6707ded16..3ac26bde1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index f40bd873e..681d72f22 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktag.1 b/man1/git-mktag.1 index eb4b0144c..5a4d0be77 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MKTAG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MKTAG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -56,7 +56,7 @@ The difference is that mktag will die before writing the tag if the tag doesn\(c .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: +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 variable: .sp .if n \{\ .RS 4 diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 index 45415319b..7fb5c3448 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MKTREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MKTREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-multi-pack-index.1 b/man1/git-multi-pack-index.1 index 00effbd65..84c2b8feb 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MULTI\-PACK\-INDEX" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MULTI\-PACK\-INDEX" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mv.1 b/man1/git-mv.1 index c6acdc6cf..5e613457e 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-MV" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-MV" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index b6083723f..8abed4954 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-NAME\-REV" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-NAME\-REV" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-notes.1 b/man1/git-notes.1 index 5a9e39977..15cc12022 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-NOTES" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-NOTES" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-p4.1 b/man1/git-p4.1 index 8e0328367..a3eb27df6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-P4" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-P4" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index d320ecdbc..096a70dae 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PACK\-OBJECTS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index 70fc57705..26dd0cef7 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PACK\-REDUNDANT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PACK\-REDUNDANT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1 index a68a6ccf1..9f1094a4a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PACK\-REFS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PACK\-REFS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1 index eae4deed1..364c4bc1d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PATCH\-ID" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PATCH\-ID" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1 index 3f666f69b..5ca69057a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PRUNE\-PACKED" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PRUNE\-PACKED" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune.1 b/man1/git-prune.1 index a93b48542..600fa36a1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PRUNE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PRUNE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pull.1 b/man1/git-pull.1 index bbd70a43f..f2c270dd4 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PULL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PULL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -964,7 +964,7 @@ You can choose to provide the name of a remote which you had previously configur .\} .sp .sp -The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if muliple urls are defined\&. +The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. .SS "Named file in \fB$GIT_DIR/remotes\fR" .sp You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The URL in this file will be used to access the repository\&. The refspec in this file will be used as default when you do not provide a refspec on the command line\&. This file should have the following format: diff --git a/man1/git-push.1 b/man1/git-push.1 index 6de4d1b7d..b3a903f6c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-PUSH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-PUSH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -799,7 +799,7 @@ You can choose to provide the name of a remote which you had previously configur .\} .sp .sp -The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if muliple urls are defined\&. +The \fB<pushurl>\fR is used for pushes only\&. It is optional and defaults to \fB<URL>\fR\&. Pushing to a remote affects all defined pushurls or to all defined urls if no pushurls are defined\&. Fetch, however, will only fetch from the first defined url if multiple urls are defined\&. .SS "Named file in \fB$GIT_DIR/remotes\fR" .sp You can choose to provide the name of a file in \fB$GIT_DIR/remotes\fR\&. The URL in this file will be used to access the repository\&. The refspec in this file will be used as default when you do not provide a refspec on the command line\&. This file should have the following format: diff --git a/man1/git-quiltimport.1 b/man1/git-quiltimport.1 index f1bf7a698..76cd33566 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-QUILTIMPORT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-QUILTIMPORT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-range-diff.1 b/man1/git-range-diff.1 index 8ee781451..68d74598f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-RANGE\-DIFF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-RANGE\-DIFF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index 7c0ecddb9..02ece0d08 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-READ\-TREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index ff7d1b8c2..22c0d5614 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REBASE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REBASE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index 5a799a608..9d769b11f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-RECEIVE\-PACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-RECEIVE\-PACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index 2b733a129..135c8b437 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REFLOG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REFLOG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-ext.1 b/man1/git-remote-ext.1 index b1665da1c..38096dc38 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REMOTE\-EXT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REMOTE\-EXT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-fd.1 b/man1/git-remote-fd.1 index 43d744b0a..d6a8acc63 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REMOTE\-FD" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REMOTE\-FD" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote.1 b/man1/git-remote.1 index ff0eaffb7..b12786518 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REMOTE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REMOTE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-repack.1 b/man1/git-repack.1 index 7bbe28214..3d74cb0ec 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REPACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REPACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-replace.1 b/man1/git-replace.1 index 3af7ebbc9..22e927bfe 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REPLACE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REPLACE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-request-pull.1 b/man1/git-request-pull.1 index 1a77bd829..4e60263a9 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REQUEST\-PULL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REQUEST\-PULL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rerere.1 b/man1/git-rerere.1 index 57c5a5078..a1bf6cf1d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-RERERE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-RERERE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reset.1 b/man1/git-reset.1 index 1694f4d97..ba79a5ff3 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-RESET" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-RESET" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-restore.1 b/man1/git-restore.1 index ec16d9988..81773d6d6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-RESTORE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-RESTORE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index ab995aaaf..5d0786964 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REV\-LIST" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index e95614b2e..13f4589c9 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REV\-PARSE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REV\-PARSE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -494,9 +494,13 @@ exists, that is what you mean (this is usually useful only for \fBHEAD\fR, \fBFETCH_HEAD\fR, \fBORIG_HEAD\fR, -\fBMERGE_HEAD\fR +\fBMERGE_HEAD\fR, +\fBREBASE_HEAD\fR, +\fBREVERT_HEAD\fR, +\fBCHERRY_PICK_HEAD\fR, +\fBBISECT_HEAD\fR and -\fBCHERRY_PICK_HEAD\fR); +\fBAUTO_MERGE\fR); .RE .sp .RS 4 @@ -562,14 +566,22 @@ if it exists; otherwise, \fIrefs/remotes/<refname>/HEAD\fR if it exists\&. -.sp +.RE +.PP \fBHEAD\fR +.RS 4 names the commit on which you based the changes in the working tree\&. +.RE +.PP \fBFETCH_HEAD\fR +.RS 4 records the branch which you fetched from a remote repository with your last \fBgit fetch\fR invocation\&. +.RE +.PP \fBORIG_HEAD\fR +.RS 4 is created by commands that move your \fBHEAD\fR in a drastic way (\fBgit am\fR, @@ -578,12 +590,45 @@ in a drastic way (\fBgit am\fR, \fBgit reset\fR), to record the position of the \fBHEAD\fR before their operation, so that you can easily change the tip of the branch back to the state before you ran them\&. +.RE +.PP \fBMERGE_HEAD\fR +.RS 4 records the commit(s) which you are merging into your branch when you run \fBgit merge\fR\&. +.RE +.PP +\fBREBASE_HEAD\fR +.RS 4 +during a rebase, records the commit at which the operation is currently stopped, either because of conflicts or an +\fBedit\fR +command in an interactive rebase\&. +.RE +.PP +\fBREVERT_HEAD\fR +.RS 4 +records the commit which you are reverting when you run +\fBgit revert\fR\&. +.RE +.PP \fBCHERRY_PICK_HEAD\fR +.RS 4 records the commit which you are cherry\-picking when you run \fBgit cherry\-pick\fR\&. +.RE +.PP +\fBBISECT_HEAD\fR +.RS 4 +records the current commit to be tested when you run +\fBgit bisect \-\-no\-checkout\fR\&. +.RE +.PP +\fBAUTO_MERGE\fR +.RS 4 +records a tree object corresponding to the state the +\fIort\fR +merge strategy wrote to the working tree when a merge operation resulted in conflicts\&. +.RE .sp Note that any of the \fIrefs/*\fR @@ -593,7 +638,6 @@ directory or from the \fB$GIT_DIR/packed\-refs\fR file\&. While the ref name encoding is unspecified, UTF\-8 is preferred as some output processing may assume ref names in UTF\-8\&. .RE -.RE .PP \fI@\fR .RS 4 diff --git a/man1/git-revert.1 b/man1/git-revert.1 index 7186e71af..d9f2f758a 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-REVERT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-REVERT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rm.1 b/man1/git-rm.1 index ebf29a65b..e160cabc5 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-RM" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-RM" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 6fed833d5..16906e722 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SEND\-EMAIL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-pack.1 b/man1/git-send-pack.1 index 78c6968a8..310530517 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SEND\-PACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SEND\-PACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n--envsubst.1 b/man1/git-sh-i18n--envsubst.1 index a522ac2eb..9dc4847f1 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SH\-I18N\-\-ENVSUBST" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SH\-I18N\-\-ENVSUBST" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n.1 b/man1/git-sh-i18n.1 index 77538e13f..ca2cf31d4 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SH\-I18N" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SH\-I18N" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-setup.1 b/man1/git-sh-setup.1 index a82264767..a2bbfd242 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SH\-SETUP" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SH\-SETUP" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shell.1 b/man1/git-shell.1 index fb8ccd79f..922cde4c5 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SHELL" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SHELL" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index 0562a70b8..8992bb662 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SHORTLOG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 55950a17b..b16c47732 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SHOW\-BRANCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SHOW\-BRANCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-index.1 b/man1/git-show-index.1 index 692e0cf8c..4f5e7dfaf 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SHOW\-INDEX" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SHOW\-INDEX" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-ref.1 b/man1/git-show-ref.1 index 06a61240d..82980de6b 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SHOW\-REF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SHOW\-REF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show.1 b/man1/git-show.1 index ddbbb6167..a1aa06ceb 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SHOW" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SHOW" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sparse-checkout.1 b/man1/git-sparse-checkout.1 index 6f34dfa72..e2fc1ca0d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SPARSE\-CHECKOUT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SPARSE\-CHECKOUT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -348,7 +348,7 @@ for non\-cone users? If it suggests paths, is it exacerbating the problem above? Also, if it suggests paths, what if the user has a file or directory that begins with either a \*(Aq!\*(Aq or \*(Aq#\*(Aq or has a \*(Aq*\*(Aq, \*(Aq\e\*(Aq, \*(Aq?\*(Aq, \*(Aq[\*(Aq, or \*(Aq]\*(Aq in its name? And if it suggests paths, will -it complete "/pro" to "/proc" (in the root filesytem) rather than to +it complete "/pro" to "/proc" (in the root filesystem) rather than to "/progress\&.txt" in the current directory? (Note that users are likely to want to start paths with a leading \*(Aq/\*(Aq in non\-cone mode, for the same reason that \&.gitignore files often have one\&.) diff --git a/man1/git-stage.1 b/man1/git-stage.1 index e6daa065e..026f434b7 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-STAGE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-STAGE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stash.1 b/man1/git-stash.1 index 269b14175..d256c40c6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-STASH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-STASH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -502,7 +502,7 @@ to stash them out for future use\&. This is similar to committing the staged cha # \&.\&.\&. hack hack hack \&.\&.\&. $ git add \-\-patch foo # add unrelated changes to the index $ git stash push \-\-staged # save these changes to the stash -# \&.\&.\&. hack hack hack, finish curent changes \&.\&.\&. +# \&.\&.\&. hack hack hack, finish current changes \&.\&.\&. $ git commit \-m \*(AqMassive\*(Aq # commit fully tested changes $ git switch fixup\-branch # switch to another branch $ git stash pop # to finish work on the saved changes diff --git a/man1/git-status.1 b/man1/git-status.1 index 325231024..4d5ef79d2 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-STATUS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-STATUS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1 index 433befafa..882054ec3 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-STRIPSPACE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-STRIPSPACE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-submodule.1 b/man1/git-submodule.1 index 61c54d8c4..120f5f50d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SUBMODULE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SUBMODULE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 1d308ad97..966c1c43c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SVN" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SVN" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-switch.1 b/man1/git-switch.1 index 4b6b2e467..c028c9807 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SWITCH" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SWITCH" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index a853d4726..36900bfbd 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-SYMBOLIC\-REF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-SYMBOLIC\-REF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-tag.1 b/man1/git-tag.1 index 1d0326cda..7544f35e7 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-TAG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-TAG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-file.1 b/man1/git-unpack-file.1 index c0941054a..56c28d06f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UNPACK\-FILE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UNPACK\-FILE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1 index 5c61b44b8..6831be650 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UNPACK\-OBJECTS" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UNPACK\-OBJECTS" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 5dad4bfe4..ee43c62c4 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1 index 220d038d6..39e793f44 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UPDATE\-REF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UPDATE\-REF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-server-info.1 b/man1/git-update-server-info.1 index dc55f4798..4b58aa2ba 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UPDATE\-SERVER\-INFO" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UPDATE\-SERVER\-INFO" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-archive.1 b/man1/git-upload-archive.1 index 4635436f4..321989ce3 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UPLOAD\-ARCHIVE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UPLOAD\-ARCHIVE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1 index 33b018cd4..17bcf616c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-UPLOAD\-PACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-UPLOAD\-PACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-var.1 b/man1/git-var.1 index cdaa795fc..d9eae367f 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-VAR" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-VAR" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-commit.1 b/man1/git-verify-commit.1 index 1ca41a3a8..e7c15b3fb 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-VERIFY\-COMMIT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-VERIFY\-COMMIT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1 index 464ab9249..4663ff168 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-VERIFY\-PACK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-VERIFY\-PACK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-tag.1 b/man1/git-verify-tag.1 index 834229363..a7f50d692 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-VERIFY\-TAG" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-VERIFY\-TAG" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-version.1 b/man1/git-version.1 index 636697669..ffb1f554f 100644 --- a/man1/git-version.1 +++ b/man1/git-version.1 @@ -2,12 +2,12 @@ .\" Title: git-version .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-VERSION" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-VERSION" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-web--browse.1 b/man1/git-web--browse.1 index 8f72eca0b..0b56f30c7 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-WEB\-\-BROWSE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-WEB\-\-BROWSE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1 index 64846cb90..eaa71a024 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-WHATCHANGED" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-WHATCHANGED" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-worktree.1 b/man1/git-worktree.1 index 5040022cc..d452c6b48 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-WORKTREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-WORKTREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -33,7 +33,7 @@ git-worktree \- Manage multiple working trees .sp .nf \fIgit worktree add\fR [\-f] [\-\-detach] [\-\-checkout] [\-\-lock [\-\-reason <string>]] - [\-b <new\-branch>] <path> [<commit\-ish>] + [\-\-orphan] [(\-b | \-B) <new\-branch>] <path> [<commit\-ish>] \fIgit worktree list\fR [\-v | \-\-porcelain [\-z]] \fIgit worktree lock\fR [\-\-reason <string>] <worktree> \fIgit worktree move\fR <worktree> <new\-path> @@ -129,6 +129,28 @@ was given\&. If does exist, it will be checked out in the new worktree, if it\(cqs not checked out anywhere else, otherwise the command will refuse to create the worktree (unless \fB\-\-force\fR is used)\&. +.sp +If +\fB<commit\-ish>\fR +is omitted, neither +\fB\-\-detach\fR, or +\fB\-\-orphan\fR +is used, and there are no valid local branches (or remote branches if +\fB\-\-guess\-remote\fR +is specified) then, as a convenience, the new worktree is associated with a new orphan branch named +\fB<branch>\fR +(after +\fB$(basename <path>)\fR +if neither +\fB\-b\fR +or +\fB\-B\fR +is used) as if +\fB\-\-orphan\fR +was passed to the command\&. In the event the repository has a remote and +\fB\-\-guess\-remote\fR +is used, but no remote or local branches exist, then the command fails with a warning reminding the user to fetch from their remote first (or override by using +\fB\-f/\-\-force\fR)\&. .RE .PP list @@ -307,6 +329,13 @@ With \fBprune\fR, do not remove anything; just report what it would remove\&. .RE .PP +\-\-orphan +.RS 4 +With +\fBadd\fR, make the new worktree and index empty, associating the worktree with a new orphan/unborn branch named +\fB<new\-branch>\fR\&. +.RE +.PP \-\-porcelain .RS 4 With diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1 index 790e3cc20..a3ae97639 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-WRITE\-TREE" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-WRITE\-TREE" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git.1 b/man1/git.1 index 0f852af1c..744d151bb 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitk.1 b/man1/gitk.1 index 392c7230b..fc59626ad 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITK" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITK" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitweb.1 b/man1/gitweb.1 index 8db3862bd..13acea4c6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITWEB" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITWEB" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -766,7 +766,7 @@ If you want to have one URL for both gitweb and your \fBhttp://\fR repositories, .\} .sp .sp -The above configuration expects your public repositories to live under \fB/pub/git\fR and will serve them as \fBhttp://git\&.domain\&.org/dir\-under\-pub\-git\fR, both as clonable Git URL and as browseable gitweb interface\&. If you then start your \fBgit-daemon\fR(1) with \fB\-\-base\-path=/pub/git \-\-export\-all\fR then you can even use the \fBgit://\fR URL with exactly the same path\&. +The above configuration expects your public repositories to live under \fB/pub/git\fR and will serve them as \fBhttp://git\&.domain\&.org/dir\-under\-pub\-git\fR, both as clonable Git URL and as browsable gitweb interface\&. If you then start your \fBgit-daemon\fR(1) with \fB\-\-base\-path=/pub/git \-\-export\-all\fR then you can even use the \fBgit://\fR URL with exactly the same path\&. .sp Setting the environment variable \fBGITWEB_CONFIG\fR will tell gitweb to use the named file (i\&.e\&. in this example \fB/etc/gitweb\&.conf\fR) as a configuration for gitweb\&. You don\(cqt really need it in above example; it is required only if your configuration file is in different place than built\-in (during compiling gitweb) \fIgitweb_config\&.perl\fR or \fB/etc/gitweb\&.conf\fR\&. See \fBgitweb.conf\fR(5) for details, especially information about precedence rules\&. .sp diff --git a/man1/scalar.1 b/man1/scalar.1 index 1f6d0ff8f..dca806e50 100644 --- a/man1/scalar.1 +++ b/man1/scalar.1 @@ -2,12 +2,12 @@ .\" Title: scalar .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "SCALAR" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "SCALAR" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index 92d8f624c..f5e6e3f39 100644 --- a/man5/gitattributes.5 +++ b/man5/gitattributes.5 @@ -2,12 +2,12 @@ .\" Title: gitattributes .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITATTRIBUTES" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-bundle.5 b/man5/gitformat-bundle.5 index fc128c79c..4a354ecbb 100644 --- a/man5/gitformat-bundle.5 +++ b/man5/gitformat-bundle.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-bundle .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFORMAT\-BUNDLE" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFORMAT\-BUNDLE" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-chunk.5 b/man5/gitformat-chunk.5 index 0e3028565..f2cdc7156 100644 --- a/man5/gitformat-chunk.5 +++ b/man5/gitformat-chunk.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-chunk .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFORMAT\-CHUNK" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFORMAT\-CHUNK" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-commit-graph.5 b/man5/gitformat-commit-graph.5 index b7495aff0..97fb2297e 100644 --- a/man5/gitformat-commit-graph.5 +++ b/man5/gitformat-commit-graph.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-commit-graph .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-index.5 b/man5/gitformat-index.5 index 7ab9d6b96..66851b3dd 100644 --- a/man5/gitformat-index.5 +++ b/man5/gitformat-index.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFORMAT\-INDEX" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFORMAT\-INDEX" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5 index e17ae3b08..f8a17affe 100644 --- a/man5/gitformat-pack.5 +++ b/man5/gitformat-pack.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFORMAT\-PACK" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFORMAT\-PACK" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-signature.5 b/man5/gitformat-signature.5 index e79d72784..c9fd9c408 100644 --- a/man5/gitformat-signature.5 +++ b/man5/gitformat-signature.5 @@ -2,12 +2,12 @@ .\" Title: gitformat-signature .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFORMAT\-SIGNATURE" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFORMAT\-SIGNATURE" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/githooks.5 b/man5/githooks.5 index 8672a75d4..27809312a 100644 --- a/man5/githooks.5 +++ b/man5/githooks.5 @@ -2,12 +2,12 @@ .\" Title: githooks .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITHOOKS" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITHOOKS" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitignore.5 b/man5/gitignore.5 index e500cc364..48c690781 100644 --- a/man5/gitignore.5 +++ b/man5/gitignore.5 @@ -2,12 +2,12 @@ .\" Title: gitignore .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITIGNORE" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITIGNORE" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5 index 713bba9da..cf40d3d2a 100644 --- a/man5/gitmailmap.5 +++ b/man5/gitmailmap.5 @@ -2,12 +2,12 @@ .\" Title: gitmailmap .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITMAILMAP" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITMAILMAP" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmodules.5 b/man5/gitmodules.5 index edb97fdf3..41e2bd30b 100644 --- a/man5/gitmodules.5 +++ b/man5/gitmodules.5 @@ -2,12 +2,12 @@ .\" Title: gitmodules .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITMODULES" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITMODULES" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-capabilities.5 b/man5/gitprotocol-capabilities.5 index f0690d17f..70d7b443f 100644 --- a/man5/gitprotocol-capabilities.5 +++ b/man5/gitprotocol-capabilities.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-capabilities .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-common.5 b/man5/gitprotocol-common.5 index 35c04956e..cfe960e32 100644 --- a/man5/gitprotocol-common.5 +++ b/man5/gitprotocol-common.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-common .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITPROTOCOL\-COMMON" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITPROTOCOL\-COMMON" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-http.5 b/man5/gitprotocol-http.5 index 93ef3d734..039f9d77a 100644 --- a/man5/gitprotocol-http.5 +++ b/man5/gitprotocol-http.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-http .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITPROTOCOL\-HTTP" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITPROTOCOL\-HTTP" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-pack.5 b/man5/gitprotocol-pack.5 index 9ad3f8aa7..530af0c6d 100644 --- a/man5/gitprotocol-pack.5 +++ b/man5/gitprotocol-pack.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-pack .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITPROTOCOL\-PACK" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITPROTOCOL\-PACK" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-v2.5 b/man5/gitprotocol-v2.5 index 27aadf327..a851b2e92 100644 --- a/man5/gitprotocol-v2.5 +++ b/man5/gitprotocol-v2.5 @@ -2,12 +2,12 @@ .\" Title: gitprotocol-v2 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITPROTOCOL\-V2" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITPROTOCOL\-V2" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5 index f99d93868..9a2c45f45 100644 --- a/man5/gitrepository-layout.5 +++ b/man5/gitrepository-layout.5 @@ -2,12 +2,12 @@ .\" Title: gitrepository-layout .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5 index 497199f8b..149cff705 100644 --- a/man5/gitweb.conf.5 +++ b/man5/gitweb.conf.5 @@ -2,12 +2,12 @@ .\" Title: gitweb.conf .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITWEB\&.CONF" "5" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITWEB\&.CONF" "5" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcli.7 b/man7/gitcli.7 index ee4c63a8f..444ff5331 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITCLI" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITCLI" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcore-tutorial.7 b/man7/gitcore-tutorial.7 index ef84b3315..7728ae69b 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITCORE\-TUTORIAL" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITCORE\-TUTORIAL" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcredentials.7 b/man7/gitcredentials.7 index 0cb3ee32d..f4a1866ed 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITCREDENTIALS" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITCREDENTIALS" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -383,7 +383,7 @@ Store the credential, if applicable to the helper\&. .PP \fBerase\fR .RS 4 -Remove a matching credential, if any, from the helper\(cqs storage\&. +Remove matching credentials, if any, from the helper\(cqs storage\&. .RE .sp The details of the credential will be provided on the helper\(cqs stdin stream\&. The exact format is the same as the input/output format of the \fBgit credential\fR plumbing command (see the section \fBINPUT/OUTPUT FORMAT\fR in \fBgit-credential\fR(1) for a detailed specification)\&. diff --git a/man7/gitcvs-migration.7 b/man7/gitcvs-migration.7 index bad2661d5..e95b07ea6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITCVS\-MIGRATION" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITCVS\-MIGRATION" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitdiffcore.7 b/man7/gitdiffcore.7 index e3406d9d7..7da9edcdc 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITDIFFCORE" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITDIFFCORE" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/giteveryday.7 b/man7/giteveryday.7 index 0f3e22238..d592609e6 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITEVERYDAY" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITEVERYDAY" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitfaq.7 b/man7/gitfaq.7 index 60f09f2ab..42d495d5d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITFAQ" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITFAQ" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index a9411230b..04c8050e7 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITGLOSSARY" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITGLOSSARY" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitnamespaces.7 b/man7/gitnamespaces.7 index 1c951d72c..786dce2f8 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITNAMESPACES" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITNAMESPACES" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitremote-helpers.7 b/man7/gitremote-helpers.7 index a7d46a496..b63132976 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITREMOTE\-HELPERS" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITREMOTE\-HELPERS" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitrevisions.7 b/man7/gitrevisions.7 index f0d907b97..fe6775ae9 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITREVISIONS" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITREVISIONS" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -97,9 +97,13 @@ exists, that is what you mean (this is usually useful only for \fBHEAD\fR, \fBFETCH_HEAD\fR, \fBORIG_HEAD\fR, -\fBMERGE_HEAD\fR +\fBMERGE_HEAD\fR, +\fBREBASE_HEAD\fR, +\fBREVERT_HEAD\fR, +\fBCHERRY_PICK_HEAD\fR, +\fBBISECT_HEAD\fR and -\fBCHERRY_PICK_HEAD\fR); +\fBAUTO_MERGE\fR); .RE .sp .RS 4 @@ -165,14 +169,22 @@ if it exists; otherwise, \fIrefs/remotes/<refname>/HEAD\fR if it exists\&. -.sp +.RE +.PP \fBHEAD\fR +.RS 4 names the commit on which you based the changes in the working tree\&. +.RE +.PP \fBFETCH_HEAD\fR +.RS 4 records the branch which you fetched from a remote repository with your last \fBgit fetch\fR invocation\&. +.RE +.PP \fBORIG_HEAD\fR +.RS 4 is created by commands that move your \fBHEAD\fR in a drastic way (\fBgit am\fR, @@ -181,12 +193,45 @@ in a drastic way (\fBgit am\fR, \fBgit reset\fR), to record the position of the \fBHEAD\fR before their operation, so that you can easily change the tip of the branch back to the state before you ran them\&. +.RE +.PP \fBMERGE_HEAD\fR +.RS 4 records the commit(s) which you are merging into your branch when you run \fBgit merge\fR\&. +.RE +.PP +\fBREBASE_HEAD\fR +.RS 4 +during a rebase, records the commit at which the operation is currently stopped, either because of conflicts or an +\fBedit\fR +command in an interactive rebase\&. +.RE +.PP +\fBREVERT_HEAD\fR +.RS 4 +records the commit which you are reverting when you run +\fBgit revert\fR\&. +.RE +.PP \fBCHERRY_PICK_HEAD\fR +.RS 4 records the commit which you are cherry\-picking when you run \fBgit cherry\-pick\fR\&. +.RE +.PP +\fBBISECT_HEAD\fR +.RS 4 +records the current commit to be tested when you run +\fBgit bisect \-\-no\-checkout\fR\&. +.RE +.PP +\fBAUTO_MERGE\fR +.RS 4 +records a tree object corresponding to the state the +\fIort\fR +merge strategy wrote to the working tree when a merge operation resulted in conflicts\&. +.RE .sp Note that any of the \fIrefs/*\fR @@ -196,7 +241,6 @@ directory or from the \fB$GIT_DIR/packed\-refs\fR file\&. While the ref name encoding is unspecified, UTF\-8 is preferred as some output processing may assume ref names in UTF\-8\&. .RE -.RE .PP \fI@\fR .RS 4 diff --git a/man7/gitsubmodules.7 b/man7/gitsubmodules.7 index b78de18f1..481e6bf02 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITSUBMODULES" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITSUBMODULES" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial-2.7 b/man7/gittutorial-2.7 index 7b6e77867..76acb281d 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITTUTORIAL\-2" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITTUTORIAL\-2" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial.7 b/man7/gittutorial.7 index a6b0b12ff..97216478c 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITTUTORIAL" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITTUTORIAL" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitworkflows.7 b/man7/gitworkflows.7 index 6da091f2c..2fa9c3a78 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: 2023-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GITWORKFLOWS" "7" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GITWORKFLOWS" "7" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |