diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-10 11:59:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-10 11:59:28 -0700 |
| commit | 5ab02d38c7657f267a14609f64185911cab1217d (patch) | |
| tree | a614cb314a0ff4428be8670f03a4760ad77b874a | |
| parent | 3ecb13f4abfbf0ca18185107737839bfafdfe4a8 (diff) | |
| download | git-manpages-5ab02d38c7657f267a14609f64185911cab1217d.tar.gz | |
Autogenerated manpages for v2.40.1-552-g91428
195 files changed, 1201 insertions, 902 deletions
diff --git a/man1/git-add.1 b/man1/git-add.1 index 9ff80af10..6830436a0 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-ADD" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-ADD" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-am.1 b/man1/git-am.1 index ec7e7d160..50ba3ead5 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-AM" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-AM" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index cc8cead7e..231dcdfa0 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index cbe0f296d..022546e93 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-APPLY" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-APPLY" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index b1369a231..669ea24d3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 3b9602355..811993289 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index d9418815f..094c664c5 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-BISECT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-BISECT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index 8824d02b5..9c0cdd5ed 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-BLAME" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-BLAME" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 808566b94..c8a39e9e8 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-BRANCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -572,8 +572,13 @@ $ git switch my2\&.6\&.14 .RE .\} .sp -\fB1. \fRThis step and the next one could be combined into a single step with "checkout \-b my2\&.6\&.14 v2\&.6\&.14"\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +This step and the next one could be combined into a single step with "checkout \-b my2\&.6\&.14 v2\&.6\&.14"\&. +T} +.TE .RE .PP Delete an unneeded branch @@ -592,15 +597,21 @@ $ git branch \-D test \fB(2)\fR .RE .\} .sp -\fB1. \fRDelete the remote\-tracking branches "todo", "html" and "man"\&. The next +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Delete the remote\-tracking branches "todo", "html" and "man"\&. The next \fIfetch\fR or \fIpull\fR will create them again unless you configure them not to\&. See \fBgit-fetch\fR(1)\&. -.br -\fB2. \fRDelete the "test" branch even if the "master" branch (or whichever branch is currently checked out) does not have all commits from the test branch\&. -.br +T} +\fB2.\fR\h'-2n':T{ +Delete the "test" branch even if the "master" branch (or whichever branch is currently checked out) does not have all commits from the test branch\&. +T} +.TE .RE .PP Listing branches from a specific remote @@ -617,14 +628,20 @@ $ git for\-each\-ref \*(Aqrefs/remotes/<remote>/<pattern>\*(Aq \fB(2)\fR .RE .\} .sp -\fB1. \fRUsing +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Using \fB\-a\fR would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern\&. -.br -\fB2. \fR\fBfor\-each\-ref\fR +T} +\fB2.\fR\h'-2n':T{ +\fBfor\-each\-ref\fR can take a wide range of options\&. See \fBgit-for-each-ref\fR(1) -.br +T} +.TE .RE .sp Patterns will normally need quoting\&. diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index 44a1f20b6..2b63a2612 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index 3dd906e9b..d6da3538a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-BUNDLE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index e1dda6f34..80413cf93 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 53a822a49..226d45eac 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index 15d194139..6e7083850 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index dd1571ac3..72b04c632 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 648ed9e0e..d06656156 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FOR" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index a2201847a..8972ce47a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index fad19f4a5..aafa31a35 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -681,8 +681,11 @@ $ git tag foo \fB(3)\fR .RE .\} .sp -.sp -\fB1. \fRcreates a new branch +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +creates a new branch \fBfoo\fR, which refers to commit \fBf\fR, and then updates \fBHEAD\fR @@ -690,19 +693,22 @@ to refer to branch \fBfoo\fR\&. In other words, we\(cqll no longer be in detached \fBHEAD\fR state after this command\&. -.br -\fB2. \fRsimilarly creates a new branch +T} +\fB2.\fR\h'-2n':T{ +similarly creates a new branch \fBfoo\fR, which refers to commit \fBf\fR, but leaves \fBHEAD\fR detached\&. -.br -\fB3. \fRcreates a new tag +T} +\fB3.\fR\h'-2n':T{ +creates a new tag \fBfoo\fR, which refers to commit \fBf\fR, leaving \fBHEAD\fR detached\&. -.br +T} +.TE .sp If we have moved away from commit \fBf\fR, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it\&. For example, to see the last two commits to which \fBHEAD\fR referred, we can use either of these commands: .sp @@ -738,15 +744,21 @@ $ git checkout hello\&.c \fB(3)\fR .RE .\} .sp -.sp -\fB1. \fRswitch branch -.br -\fB2. \fRtake a file out of another commit -.br -\fB3. \fRrestore +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +switch branch +T} +\fB2.\fR\h'-2n':T{ +take a file out of another commit +T} +\fB3.\fR\h'-2n':T{ +restore \fBhello\&.c\fR from the index -.br +T} +.TE .sp If you want to check out \fIall\fR C source files out of the index, you can say .sp diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index c2b06846f..71e40c877 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -318,18 +318,25 @@ $ git cherry\-pick \-Xpatience topic^ \fB(4)\fR .RE .\} .sp -.sp -\fB1. \fRapply the change that would be shown by +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +apply the change that would be shown by \fBgit show topic^\fR\&. In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results\&. -.br -\fB2. \fRsummarize changes to be reconciled -.br -\fB3. \fRcancel the cherry\-pick\&. In other words, return to the pre\-cherry\-pick state, preserving any local modifications you had in the working tree\&. -.br -\fB4. \fRtry to apply the change introduced by +T} +\fB2.\fR\h'-2n':T{ +summarize changes to be reconciled +T} +\fB3.\fR\h'-2n':T{ +cancel the cherry\-pick\&. In other words, return to the pre\-cherry\-pick state, preserving any local modifications you had in the working tree\&. +T} +\fB4.\fR\h'-2n':T{ +try to apply the change introduced by \fBtopic^\fR again, spending extra time to avoid mistakes based on incorrectly matching context lines\&. -.br +T} +.TE .SH "SEE ALSO" .sp \fBgit-revert\fR(1) diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index 02f40a4fa..3011b614c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CHERRY" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index 28193a786..018570333 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CITOOL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index 372f43bdc..61970cbac 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CLEAN" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clone.1 b/man1/git-clone.1 index a8bfe7f85..b070665bf 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CLONE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CLONE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-column.1 b/man1/git-column.1 index eebcd7c95..e0a7350a4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-COLUMN" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index b32b60f9d..53a8881fb 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 19301ae7f..6aca62019 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 667dd04e6..f627a7744 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-COMMIT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-config.1 b/man1/git-config.1 index ee3ad4bf8..93b4c5d4a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CONFIG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index b3b2d8510..f67ea34b4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index 9db42824d..ac697e3ea 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index df072bbc5..b4625ab51 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index ce525175e..63919375c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STO" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential.1 b/man1/git-credential.1 index f91590061..ee460d8d8 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -190,6 +190,11 @@ Generated passwords such as an OAuth access token may have an expiry date\&. Whe ignores expired passwords\&. Represented as Unix time UTC, seconds since 1970\&. .RE .PP +\fBoauth_refresh_token\fR +.RS 4 +An OAuth refresh token may accompany a password that is an OAuth access token\&. Helpers must treat this attribute as confidential like the password attribute\&. Git itself has no special behaviour for this attribute\&. +.RE +.PP \fBurl\fR .RS 4 When this special attribute is read by diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index f76aca7fa..61e25fbeb 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 5403f6751..79a692a64 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index b97a734f6..16870501b 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 5700b6fc9..0e30672f0 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DAEMON" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-describe.1 b/man1/git-describe.1 index a5d4c787e..a57a3792c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diagnose.1 b/man1/git-diagnose.1 index 46abf9ac3..2cb3f8796 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DIAGNOSE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DIAGNOSE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 0fcb917df..4b3bf88af 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 93fe02354..9118e4640 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index ea766a1b1..cfec71b00 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 9f7f38b2e..217a95d8c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DIFF" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2035,17 +2035,24 @@ $ git diff HEAD \fB(3)\fR .RE .\} .sp -\fB1. \fRChanges in the working tree not yet staged for the next commit\&. -.br -\fB2. \fRChanges between the index and your last commit; what you would be committing if you run +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Changes in the working tree not yet staged for the next commit\&. +T} +\fB2.\fR\h'-2n':T{ +Changes between the index and your last commit; what you would be committing if you run \fBgit commit\fR without \fB\-a\fR option\&. -.br -\fB3. \fRChanges in the working tree since your last commit; what you would be committing if you run +T} +\fB3.\fR\h'-2n':T{ +Changes in the working tree since your last commit; what you would be committing if you run \fBgit commit \-a\fR -.br +T} +.TE .RE .PP Comparing with arbitrary commits @@ -2063,12 +2070,19 @@ $ git diff HEAD^ HEAD \fB(3)\fR .RE .\} .sp -\fB1. \fRInstead of using the tip of the current branch, compare with the tip of "test" branch\&. -.br -\fB2. \fRInstead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test"\&. -.br -\fB3. \fRCompare the version before the last commit and the last commit\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Instead of using the tip of the current branch, compare with the tip of "test" branch\&. +T} +\fB2.\fR\h'-2n':T{ +Instead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test"\&. +T} +\fB3.\fR\h'-2n':T{ +Compare the version before the last commit and the last commit\&. +T} +.TE .RE .PP Comparing branches @@ -2086,12 +2100,19 @@ $ git diff topic\&.\&.\&.master \fB(3)\fR .RE .\} .sp -\fB1. \fRChanges between the tips of the topic and the master branches\&. -.br -\fB2. \fRSame as above\&. -.br -\fB3. \fRChanges that occurred on the master branch since when the topic branch was started off it\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Changes between the tips of the topic and the master branches\&. +T} +\fB2.\fR\h'-2n':T{ +Same as above\&. +T} +\fB3.\fR\h'-2n':T{ +Changes that occurred on the master branch since when the topic branch was started off it\&. +T} +.TE .RE .PP Limiting the diff output @@ -2109,12 +2130,19 @@ $ git diff arch/i386 include/asm\-i386 \fB(3)\fR .RE .\} .sp -\fB1. \fRShow only modification, rename, and copy, but not addition or deletion\&. -.br -\fB2. \fRShow only names and the nature of change, but not actual diff output\&. -.br -\fB3. \fRLimit diff output to named subtrees\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Show only modification, rename, and copy, but not addition or deletion\&. +T} +\fB2.\fR\h'-2n':T{ +Show only names and the nature of change, but not actual diff output\&. +T} +\fB3.\fR\h'-2n':T{ +Limit diff output to named subtrees\&. +T} +.TE .RE .PP Munging the diff output @@ -2131,10 +2159,16 @@ $ git diff \-R \fB(2)\fR .RE .\} .sp -\fB1. \fRSpend extra cycles to find renames, copies and complete rewrites (very expensive)\&. -.br -\fB2. \fROutput diff in reverse\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Spend extra cycles to find renames, copies and complete rewrites (very expensive)\&. +T} +\fB2.\fR\h'-2n':T{ +Output diff in reverse\&. +T} +.TE .RE .SH "CONFIGURATION" .sp diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index 21487cd5a..1c4fc187d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index 157bfecac..8635d9b55 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index a52dd3664..5969b63a4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index c2de6e6e0..2506be682 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index 2ef0111fc..b1c17cca6 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FETCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FETCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index e00a6a255..39c4adc77 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index fe6a5cb29..a43e73306 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index ddf0faf6d..31d944f3c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 9f4a3b01c..723cdd01a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index ceb572d2d..495f2e911 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index f611a4694..4b8ff70ce 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index dc38d6b80..a8b0329f6 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FSCK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FSCK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsmonitor--daemon.1 b/man1/git-fsmonitor--daemon.1 index 0300131e3..d0d5813b6 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-FSMONITOR\-\-DA" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 0a4821c4e..a05ee940c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-GC" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-GC" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-get-tar-commit-id.1 b/man1/git-get-tar-commit-id.1 index 3768c0910..0e15e8834 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMI" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 22e4e73d1..22637b957 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-GREP" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-GREP" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gui.1 b/man1/git-gui.1 index 38ed20b44..f707ce3c9 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-GUI" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-GUI" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index 6a5c4b241..28d941898 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-help.1 b/man1/git-help.1 index 2add542de..55ad383d3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-HELP" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-HELP" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hook.1 b/man1/git-hook.1 index b1faef172..6a46992d2 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-HOOK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-HOOK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index d06fbb42e..ed8594ea3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index 17eff6699..2c2443c96 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index 9715e642e..27271e54a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index 74625acdb..b0e7cc304 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index 17b9df404..31fda5748 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index 665eb994c..72dd16460 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index 1f872b5b7..9aaea7177 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-INIT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-INIT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -236,12 +236,19 @@ $ git commit \fB(3)\fR .RE .\} .sp -\fB1. \fRCreate a /path/to/my/codebase/\&.git directory\&. -.br -\fB2. \fRAdd all existing files to the index\&. -.br -\fB3. \fRRecord the pristine state as the first commit in the history\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Create a /path/to/my/codebase/\&.git directory\&. +T} +\fB2.\fR\h'-2n':T{ +Add all existing files to the index\&. +T} +\fB3.\fR\h'-2n':T{ +Record the pristine state as the first commit in the history\&. +T} +.TE .RE .SH "CONFIGURATION" .sp diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index f2f270b1f..59078b5b9 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index fbd657c92..b937f168d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAI" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-log.1 b/man1/git-log.1 index e1e64f383..97063ab58 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-LOG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-LOG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index 1c7ca0a99..62f2c0d56 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index 4359d8f70..5818070ae 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 6648245f5..e5a878598 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index 8ec2b8867..cd89b490f 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MAILINFO" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index f03c4e65d..0603a9b2d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index e159cb329..c484e4f05 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index c865e2e80..2eee7b3e3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index f00e62c24..c402dbdb4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index c17f8fd7f..66072d378 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGE\-INDEX" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1 index fccb8b706..db23fb1bf 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGE\-ONE\-FIL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGE\-ONE\-FILE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index 53d49dfc0..eb6b2a6ba 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge.1 b/man1/git-merge.1 index e2b52da42..baff1f327 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index 984a3eeb7..1d96c3760 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LI" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LIB" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 443d9d6c3..7b4150822 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktag.1 b/man1/git-mktag.1 index 5116ab27a..d27c25eda 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MKTAG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MKTAG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 index c1e1d09ff..b2f33d22d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MKTREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MKTREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-multi-pack-index.1 b/man1/git-multi-pack-index.1 index 23559f241..d4ad0e051 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MULTI\-PACK\-IN" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MULTI\-PACK\-INDEX" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mv.1 b/man1/git-mv.1 index 209f633af..4d8436600 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-MV" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-MV" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index d137f04d4..f0b743dda 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-NAME\-REV" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-NAME\-REV" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-notes.1 b/man1/git-notes.1 index 0064f8169..37c57c96a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-NOTES" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-NOTES" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-p4.1 b/man1/git-p4.1 index f097bc136..846f389fe 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-P4" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-P4" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index 16383efe8..1f1b5cfe4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PACK\-OBJECTS" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index 6f2cad115..bc807624f 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PACK\-REDUNDANT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PACK\-REDUNDANT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1 index 3a575f73f..159c2021c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PACK\-REFS" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PACK\-REFS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1 index a53ab7283..978fb1dd4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PATCH\-ID" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PATCH\-ID" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1 index af97225e1..7212897a0 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PRUNE\-PACKED" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PRUNE\-PACKED" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune.1 b/man1/git-prune.1 index 52720dac2..7ad285eb2 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PRUNE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PRUNE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pull.1 b/man1/git-pull.1 index edead967c..68d27c5e8 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PULL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PULL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-push.1 b/man1/git-push.1 index 73724b09d..fffff7af9 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-PUSH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-PUSH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-quiltimport.1 b/man1/git-quiltimport.1 index ce0bc4d7d..7665b88c4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-QUILTIMPORT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-QUILTIMPORT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-range-diff.1 b/man1/git-range-diff.1 index e688a8fa4..1bd18fce0 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-RANGE\-DIFF" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-RANGE\-DIFF" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index 10e846239..0f2af7437 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-READ\-TREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 6b972f70d..3e0a9414e 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REBASE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REBASE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index e14f57f05..d6b28bada 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-RECEIVE\-PACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-RECEIVE\-PACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index 1e42cea04..c402d168d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REFLOG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REFLOG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-ext.1 b/man1/git-remote-ext.1 index d058fd7f2..b0c563914 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REMOTE\-EXT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REMOTE\-EXT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-fd.1 b/man1/git-remote-fd.1 index facc7cd34..fd5b7caeb 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REMOTE\-FD" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REMOTE\-FD" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote.1 b/man1/git-remote.1 index 59e1208af..1c495cfcb 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REMOTE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REMOTE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-repack.1 b/man1/git-repack.1 index b82f5343b..80d09806d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REPACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REPACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-replace.1 b/man1/git-replace.1 index d4ea070ad..3ff16c070 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REPLACE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REPLACE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-request-pull.1 b/man1/git-request-pull.1 index 350587ef9..7046791aa 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REQUEST\-PULL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REQUEST\-PULL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rerere.1 b/man1/git-rerere.1 index da565063a..0045e2500 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-RERERE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-RERERE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reset.1 b/man1/git-reset.1 index 206fe6295..4eab32eb1 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-RESET" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-RESET" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -224,24 +224,32 @@ $ git pull git://info\&.example\&.com/ nitfol \fB(4)\fR .RE .\} .sp -\fB1. \fRYou are happily working on something, and find the changes in these files are in good order\&. You do not want to see them when you run +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +You are happily working on something, and find the changes in these files are in good order\&. You do not want to see them when you run \fBgit diff\fR, because you plan to work on other files and changes with these files are distracting\&. -.br -\fB2. \fRSomebody asks you to pull, and the changes sound worthy of merging\&. -.br -\fB3. \fRHowever, you already dirtied the index (i\&.e\&. your index does not match the +T} +\fB2.\fR\h'-2n':T{ +Somebody asks you to pull, and the changes sound worthy of merging\&. +T} +\fB3.\fR\h'-2n':T{ +However, you already dirtied the index (i\&.e\&. your index does not match the \fBHEAD\fR commit)\&. But you know the pull you are going to make does not affect \fBfrotz\&.c\fR or \fBfilfre\&.c\fR, so you revert the index changes for these two files\&. Your changes in working tree remain there\&. -.br -\fB4. \fRThen you can pull and merge, leaving +T} +\fB4.\fR\h'-2n':T{ +Then you can pull and merge, leaving \fBfrotz\&.c\fR and \fBfilfre\&.c\fR changes still in the working tree\&. -.br +T} +.TE .RE .PP Undo a commit and redo @@ -260,11 +268,17 @@ $ git commit \-a \-c ORIG_HEAD \fB(3)\fR .RE .\} .sp -\fB1. \fRThis is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both\&. Leaves working tree as it was before "reset"\&. -.br -\fB2. \fRMake corrections to working tree files\&. -.br -\fB3. \fR"reset" copies the old head to +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both\&. Leaves working tree as it was before "reset"\&. +T} +\fB2.\fR\h'-2n':T{ +Make corrections to working tree files\&. +T} +\fB3.\fR\h'-2n':T{ +"reset" copies the old head to \fB\&.git/ORIG_HEAD\fR; redo the commit by starting with its log message\&. If you do not need to edit the message further, you can give \fB\-C\fR option instead\&. @@ -273,7 +287,8 @@ See also the \fB\-\-amend\fR option to \fBgit-commit\fR(1)\&. -.br +T} +.TE .RE .PP Undo a commit, making it a topic branch @@ -291,19 +306,26 @@ $ git switch topic/wip \fB(3)\fR .RE .\} .sp -\fB1. \fRYou have made some commits, but realize they were premature to be in the +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +You have made some commits, but realize they were premature to be in the \fBmaster\fR branch\&. You want to continue polishing them in a topic branch, so create \fBtopic/wip\fR branch off of the current \fBHEAD\fR\&. -.br -\fB2. \fRRewind the master branch to get rid of those three commits\&. -.br -\fB3. \fRSwitch to +T} +\fB2.\fR\h'-2n':T{ +Rewind the master branch to get rid of those three commits\&. +T} +\fB3.\fR\h'-2n':T{ +Switch to \fBtopic/wip\fR branch and keep working\&. -.br +T} +.TE .RE .PP Undo commits permanently @@ -320,14 +342,19 @@ $ git reset \-\-hard HEAD~3 \fB(1)\fR .RE .\} .sp -\fB1. \fRThe last three commits (\fBHEAD\fR, +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +The last three commits (\fBHEAD\fR, \fBHEAD^\fR, and \fBHEAD~2\fR) were bad and you do not want to ever see them again\&. Do \fBnot\fR do this if you have already given these commits to somebody else\&. (See the "RECOVERING FROM UPSTREAM REBASE" section in \fBgit-rebase\fR(1) for the implications of doing so\&.) -.br +T} +.TE .RE .PP Undo a merge or pull @@ -351,19 +378,27 @@ $ git reset \-\-hard ORIG_HEAD \fB(4)\fR .RE .\} .sp -\fB1. \fRTry to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later\&. -.br -\fB2. \fR"pull" has not made merge commit, so +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later\&. +T} +\fB2.\fR\h'-2n':T{ +"pull" has not made merge commit, so \fBgit reset \-\-hard\fR which is a synonym for \fBgit reset \-\-hard HEAD\fR clears the mess from the index file and the working tree\&. -.br -\fB3. \fRMerge a topic branch into the current branch, which resulted in a fast\-forward\&. -.br -\fB4. \fRBut you decided that the topic branch is not ready for public consumption yet\&. "pull" or "merge" always leaves the original tip of the current branch in +T} +\fB3.\fR\h'-2n':T{ +Merge a topic branch into the current branch, which resulted in a fast\-forward\&. +T} +\fB4.\fR\h'-2n':T{ +But you decided that the topic branch is not ready for public consumption yet\&. "pull" or "merge" always leaves the original tip of the current branch in \fBORIG_HEAD\fR, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit\&. -.br +T} +.TE .RE .PP Undo a merge or pull inside a dirty working tree @@ -384,16 +419,22 @@ $ git reset \-\-merge ORIG_HEAD \fB(2)\fR .RE .\} .sp -\fB1. \fREven if you may have local modifications in your working tree, you can safely say +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +Even if you may have local modifications in your working tree, you can safely say \fBgit pull\fR when you know that the change in the other branch does not overlap with them\&. -.br -\fB2. \fRAfter inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory\&. Running +T} +\fB2.\fR\h'-2n':T{ +After inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory\&. Running \fBgit reset \-\-hard ORIG_HEAD\fR will let you go back to where you were, but it will discard your local changes, which you do not want\&. \fBgit reset \-\-merge\fR keeps your local changes\&. -.br +T} +.TE .RE .PP Interrupted workflow @@ -418,18 +459,25 @@ $ git reset \fB(3)\fR .RE .\} .sp -\fB1. \fRThis commit will get blown away so a throw\-away log message is OK\&. -.br -\fB2. \fRThis removes the +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +This commit will get blown away so a throw\-away log message is OK\&. +T} +\fB2.\fR\h'-2n':T{ +This removes the \fIWIP\fR commit from the commit history, and sets your working tree to the state just before you made that snapshot\&. -.br -\fB3. \fRAt this point the index file still has all the WIP changes you committed as +T} +\fB3.\fR\h'-2n':T{ +At this point the index file still has all the WIP changes you committed as \fIsnapshot WIP\fR\&. This updates the index to show your WIP files as uncommitted\&. .sp See also \fBgit-stash\fR(1)\&. -.br +T} +.TE .RE .PP Reset a single file in the index @@ -448,12 +496,19 @@ $ git add frotz\&.c \fB(3)\fR .RE .\} .sp -\fB1. \fRThis removes the file from the index while keeping it in the working directory\&. -.br -\fB2. \fRThis commits all other changes in the index\&. -.br -\fB3. \fRAdds the file to the index again\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +This removes the file from the index while keeping it in the working directory\&. +T} +\fB2.\fR\h'-2n':T{ +This commits all other changes in the index\&. +T} +\fB3.\fR\h'-2n':T{ +Adds the file to the index again\&. +T} +.TE .RE .PP Keep changes in working tree while discarding some previous commits @@ -476,19 +531,26 @@ $ git reset \-\-keep start \fB(3)\fR .RE .\} .sp -\fB1. \fRThis commits your first edits in +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +This commits your first edits in \fBbranch1\fR\&. -.br -\fB2. \fRIn the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to +T} +\fB2.\fR\h'-2n':T{ +In the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to \fBbranch2\fR (i\&.e\&. \fBgit switch \-c branch2 start\fR), but nobody is perfect\&. -.br -\fB3. \fRBut you can use +T} +\fB3.\fR\h'-2n':T{ +But you can use \fBreset \-\-keep\fR to remove the unwanted commit after you switched to \fBbranch2\fR\&. -.br +T} +.TE .RE .PP Split a commit apart into a sequence of commits @@ -516,20 +578,27 @@ $ git commit \&.\&.\&. \fB(8)\fR .RE .\} .sp -\fB1. \fRFirst, reset the history back one commit so that we remove the original commit, but leave the working tree with all the changes\&. The \-N ensures that any new files added with +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +First, reset the history back one commit so that we remove the original commit, but leave the working tree with all the changes\&. The \-N ensures that any new files added with \fBHEAD\fR are still marked so that \fBgit add \-p\fR will find them\&. -.br -\fB2. \fRNext, we interactively select diff hunks to add using the +T} +\fB2.\fR\h'-2n':T{ +Next, we interactively select diff hunks to add using the \fBgit add \-p\fR facility\&. This will ask you about each diff hunk in sequence and you can use simple commands such as "yes, include this", "No don\(cqt include this" or even the very powerful "edit" facility\&. -.br -\fB3. \fROnce satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using +T} +\fB3.\fR\h'-2n':T{ +Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using \fBgit diff \-\-cached\fR\&. This shows all the changes that have been moved into the index and are about to be committed\&. -.br -\fB4. \fRNext, commit the changes stored in the index\&. The +T} +\fB4.\fR\h'-2n':T{ +Next, commit the changes stored in the index\&. The \fB\-c\fR option specifies to pre\-populate the commit message from the original message that you started with in the first commit\&. This is helpful to avoid retyping it\&. The \fBHEAD@{1}\fR @@ -538,16 +607,21 @@ is a special notation for the commit that used to be at prior to the original reset commit (1 change ago)\&. See \fBgit-reflog\fR(1) for more details\&. You may also use any other valid commit reference\&. -.br -\fB5. \fRYou can repeat steps 2\-4 multiple times to break the original code into any number of commits\&. -.br -\fB6. \fRNow you\(cqve split out many of the changes into their own commits, and might no longer use the patch mode of +T} +\fB5.\fR\h'-2n':T{ +You can repeat steps 2\-4 multiple times to break the original code into any number of commits\&. +T} +\fB6.\fR\h'-2n':T{ +Now you\(cqve split out many of the changes into their own commits, and might no longer use the patch mode of \fBgit add\fR, in order to select all remaining uncommitted changes\&. -.br -\fB7. \fROnce again, check to verify that you\(cqve included what you want to\&. You may also wish to verify that git diff doesn\(cqt show any remaining changes to be committed later\&. -.br -\fB8. \fRAnd finally create the final commit\&. -.br +T} +\fB7.\fR\h'-2n':T{ +Once again, check to verify that you\(cqve included what you want to\&. You may also wish to verify that git diff doesn\(cqt show any remaining changes to be committed later\&. +T} +\fB8.\fR\h'-2n':T{ +And finally create the final commit\&. +T} +.TE .RE .SH "DISCUSSION" .sp diff --git a/man1/git-restore.1 b/man1/git-restore.1 index 92cd64f46..676c47562 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-RESTORE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-RESTORE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -230,11 +230,16 @@ $ git restore hello\&.c \fB(2)\fR .RE .\} .sp -.sp -\fB1. \fRtake a file out of another commit -.br -\fB2. \fRrestore hello\&.c from the index -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +take a file out of another commit +T} +\fB2.\fR\h'-2n':T{ +restore hello\&.c from the index +T} +.TE .sp If you want to restore \fIall\fR C source files to match the version in the index, you can say .sp diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index 48bd31cc0..8876e8d0c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REV\-LIST" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index 447f9bb2e..2ad3a5915 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REV\-PARSE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REV\-PARSE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-revert.1 b/man1/git-revert.1 index e46709b4f..646eeac3a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-REVERT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-REVERT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rm.1 b/man1/git-rm.1 index 9f9106b3b..ac40b36a6 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-RM" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-RM" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index e97fc1f5e..920487403 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SEND\-EMAIL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-pack.1 b/man1/git-send-pack.1 index fde58cc70..cf8f87bda 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SEND\-PACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SEND\-PACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n--envsubst.1 b/man1/git-sh-i18n--envsubst.1 index 9e52e8a51..0a3382c89 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SH\-I18N\-\-ENV" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SH\-I18N\-\-ENVSUBST" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n.1 b/man1/git-sh-i18n.1 index 95911b0ba..df2e6a62b 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SH\-I18N" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SH\-I18N" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-setup.1 b/man1/git-sh-setup.1 index 9a8a3cb1e..611606a7b 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SH\-SETUP" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SH\-SETUP" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shell.1 b/man1/git-shell.1 index 642552788..ed54edf31 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SHELL" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SHELL" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index 3d8dce4c3..88443be9b 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SHORTLOG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index a48e0e637..be783e6ff 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SHOW\-BRANCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SHOW\-BRANCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-index.1 b/man1/git-show-index.1 index 08cc2c048..050e79329 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SHOW\-INDEX" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SHOW\-INDEX" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-ref.1 b/man1/git-show-ref.1 index fb59a3812..c93fcc8c2 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SHOW\-REF" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SHOW\-REF" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show.1 b/man1/git-show.1 index 82381eaa9..2f3855213 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SHOW" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SHOW" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sparse-checkout.1 b/man1/git-sparse-checkout.1 index a702c09aa..8de3b5b80 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SPARSE\-CHECKOU" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SPARSE\-CHECKOUT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stage.1 b/man1/git-stage.1 index 3b38f8c62..94c1343db 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-STAGE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-STAGE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stash.1 b/man1/git-stash.1 index b8b73b59f..6036aea8e 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-STASH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-STASH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-status.1 b/man1/git-status.1 index fe009bf8d..1e041837a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-STATUS" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-STATUS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1 index 94fefae36..99263e568 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-STRIPSPACE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-STRIPSPACE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-submodule.1 b/man1/git-submodule.1 index c9f7c6e74..ec444087f 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SUBMODULE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SUBMODULE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 10b99d7f5..eb7345b5c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SVN" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SVN" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-switch.1 b/man1/git-switch.1 index 85b73b3d8..6117caf6d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SWITCH" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SWITCH" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index 43f4934fc..1789a034d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-SYMBOLIC\-REF" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-SYMBOLIC\-REF" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-tag.1 b/man1/git-tag.1 index 48d56483d..68febf114 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-TAG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-TAG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-file.1 b/man1/git-unpack-file.1 index d879b7e6c..279344849 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UNPACK\-FILE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UNPACK\-FILE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1 index d5516bcb5..f6db6ec74 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UNPACK\-OBJECTS" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UNPACK\-OBJECTS" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 39da48fd1..52eb71813 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -452,26 +452,39 @@ M foo\&.c .RE .\} .sp -\fB1. \fRforces lstat(2) to set "assume unchanged" bits for paths that match index\&. -.br -\fB2. \fRmark the path to be edited\&. -.br -\fB3. \fRthis does lstat(2) and finds index matches the path\&. -.br -\fB4. \fRthis does lstat(2) and finds index does +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +forces lstat(2) to set "assume unchanged" bits for paths that match index\&. +T} +\fB2.\fR\h'-2n':T{ +mark the path to be edited\&. +T} +\fB3.\fR\h'-2n':T{ +this does lstat(2) and finds index matches the path\&. +T} +\fB4.\fR\h'-2n':T{ +this does lstat(2) and finds index does \fBnot\fR match the path\&. -.br -\fB5. \fRregistering the new version to index sets "assume unchanged" bit\&. -.br -\fB6. \fRand it is assumed unchanged\&. -.br -\fB7. \fReven after you edit it\&. -.br -\fB8. \fRyou can tell about the change after the fact\&. -.br -\fB9. \fRnow it checks with lstat(2) and finds it has been changed\&. -.br +T} +\fB5.\fR\h'-2n':T{ +registering the new version to index sets "assume unchanged" bit\&. +T} +\fB6.\fR\h'-2n':T{ +and it is assumed unchanged\&. +T} +\fB7.\fR\h'-2n':T{ +even after you edit it\&. +T} +\fB8.\fR\h'-2n':T{ +you can tell about the change after the fact\&. +T} +\fB9.\fR\h'-2n':T{ +now it checks with lstat(2) and finds it has been changed\&. +T} +.TE .RE .SH "SKIP\-WORKTREE BIT" .sp diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1 index a39a29de7..56a81a4dd 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UPDATE\-REF" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UPDATE\-REF" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-server-info.1 b/man1/git-update-server-info.1 index dd86ad851..ae117f45f 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UPDATE\-SERVER\" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UPDATE\-SERVER\-INFO" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-archive.1 b/man1/git-upload-archive.1 index 174c6f806..dd7a57c43 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UPLOAD\-ARCHIVE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UPLOAD\-ARCHIVE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1 index 509d494b1..05eb574f1 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-UPLOAD\-PACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-UPLOAD\-PACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-var.1 b/man1/git-var.1 index 792fa9328..fa436b05c 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-VAR" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-VAR" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-commit.1 b/man1/git-verify-commit.1 index 96be0aab1..d16150fdd 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-VERIFY\-COMMIT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-VERIFY\-COMMIT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1 index 8645d7fd3..2e398fee1 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-VERIFY\-PACK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-VERIFY\-PACK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-tag.1 b/man1/git-verify-tag.1 index 47aded722..096840a40 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-VERIFY\-TAG" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-VERIFY\-TAG" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-version.1 b/man1/git-version.1 index c3640f873..e9d182663 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-VERSION" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-VERSION" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-web--browse.1 b/man1/git-web--browse.1 index c32198766..3cecbf04e 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-WEB\-\-BROWSE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-WEB\-\-BROWSE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1 index 3ffe5dce2..2d9d0195d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-WHATCHANGED" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-WHATCHANGED" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-worktree.1 b/man1/git-worktree.1 index 3504c9996..25ba5a197 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-WORKTREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-WORKTREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1 index f90568f73..20ecb2fd1 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT\-WRITE\-TREE" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT\-WRITE\-TREE" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git.1 b/man1/git.1 index 8635f93e3..a8a759bc0 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GIT" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GIT" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitk.1 b/man1/gitk.1 index 872a982a6..9e50a7cc3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITK" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITK" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitweb.1 b/man1/gitweb.1 index 236c57602..d83c55107 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITWEB" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITWEB" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/scalar.1 b/man1/scalar.1 index 1c557c146..9aaab6f30 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "SCALAR" "1" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "SCALAR" "1" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index 40e5bc3c8..b246341bc 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITATTRIBUTES" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -128,13 +128,13 @@ These attributes affect how the contents stored in the repository are copied to \fBtext\fR .RS 4 .sp -This attribute enables and controls end\-of\-line normalization\&. When a text file is normalized, its line endings are converted to LF in the repository\&. To control what line ending style is used in the working directory, use the \fBeol\fR attribute for a single file and the \fBcore\&.eol\fR configuration variable for all text files\&. Note that setting \fBcore\&.autocrlf\fR to \fBtrue\fR or \fBinput\fR overrides \fBcore\&.eol\fR (see the definitions of those options in \fBgit-config\fR(1))\&. +This attribute marks the path as a text file, which enables end\-of\-line conversion: When a matching file is added to the index, the file\(cqs line endings are normalized to LF in the index\&. Conversely, when the file is copied from the index to the working directory, its line endings may be converted from LF to CRLF depending on the \fBeol\fR attribute, the Git config, and the platform (see explanation of \fBeol\fR below)\&. .PP Set .RS 4 Setting the \fBtext\fR -attribute on a path enables end\-of\-line normalization and marks the path as a text file\&. End\-of\-line conversion takes place without guessing the content type\&. +attribute on a path enables end\-of\-line conversion on checkin and checkout as described above\&. Line endings are normalized to LF in the index every time the file is checked in, even if the file was previously added to Git with CRLF line endings\&. .RE .PP Unset @@ -148,7 +148,7 @@ Set to string value "auto" .RS 4 When \fBtext\fR -is set to "auto", the path is marked for automatic end\-of\-line conversion\&. If Git decides that the content is text, its line endings are converted to LF on checkin\&. When the file has been committed with CRLF, no conversion is done\&. +is set to "auto", Git decides by itself whether the file is text or binary\&. If it is text and the file was not already in Git with CRLF endings, line endings are converted on checkin and checkout as described above\&. Otherwise, no conversion is done on checkin or checkout\&. .RE .PP Unspecified @@ -171,16 +171,34 @@ Any other value causes Git to act as if \fBtext\fR has been left unspecified\&. \fBeol\fR .RS 4 .sp -This attribute sets a specific line\-ending style to be used in the working directory\&. This attribute has effect only if the \fBtext\fR attribute is set or unspecified, or if it is set to \fBauto\fR, the file is detected as text, and it is stored with LF endings in the index\&. Note that setting this attribute on paths which are in the index with CRLF line endings may make the paths to be considered dirty unless \fBtext=auto\fR is set\&. Adding the path to the index again will normalize the line endings in the index\&. +This attribute marks a path to use a specific line\-ending style in the working tree when it is checked out\&. It has effect only if \fBtext\fR or \fBtext=auto\fR is set (see above), but specifying \fBeol\fR automatically sets \fBtext\fR if \fBtext\fR was left unspecified\&. .PP Set to string value "crlf" .RS 4 -This setting forces Git to normalize line endings for this file on checkin and convert them to CRLF when the file is checked out\&. +This setting converts the file\(cqs line endings in the working directory to CRLF when the file is checked out\&. .RE .PP Set to string value "lf" .RS 4 -This setting forces Git to normalize line endings to LF on checkin and prevents conversion to CRLF when the file is checked out\&. +This setting uses the same line endings in the working directory as in the index when the file is checked out\&. +.RE +.PP +Unspecified +.RS 4 +If the +\fBeol\fR +attribute is unspecified for a file, its line endings in the working directory are determined by the +\fBcore\&.autocrlf\fR +or +\fBcore\&.eol\fR +configuration variable (see the definitions of those options in +\fBgit-config\fR(1))\&. If +\fBtext\fR +is set but neither of those variables is, the default is +\fBeol=crlf\fR +on Windows and +\fBeol=lf\fR +on all other platforms\&. .RE .RE .sp diff --git a/man5/gitformat-bundle.5 b/man5/gitformat-bundle.5 index 0cbf59e18..79f06c1f5 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFORMAT\-BUNDLE" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFORMAT\-BUNDLE" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-chunk.5 b/man5/gitformat-chunk.5 index 43238e047..caf778f11 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFORMAT\-CHUNK" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFORMAT\-CHUNK" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-commit-graph.5 b/man5/gitformat-commit-graph.5 index e30786550..0880b5caf 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFORMAT\-COMMIT\-G" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFORMAT\-COMMIT\-GRAPH" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-index.5 b/man5/gitformat-index.5 index 30a3598fb..3dddce8a1 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFORMAT\-INDEX" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFORMAT\-INDEX" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-pack.5 b/man5/gitformat-pack.5 index 166a9cee2..3d3d59c46 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFORMAT\-PACK" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFORMAT\-PACK" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitformat-signature.5 b/man5/gitformat-signature.5 index 491fafcc3..82504fa48 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFORMAT\-SIGNATURE" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFORMAT\-SIGNATURE" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/githooks.5 b/man5/githooks.5 index a02022e8a..74b5f4fc7 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITHOOKS" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITHOOKS" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -436,7 +436,31 @@ The commits are guaranteed to be listed in the order that they were processed by .RE .SS "sendemail\-validate" .sp -This hook is invoked by \fBgit-send-email\fR(1)\&. It takes a single parameter, the name of the file that holds the e\-mail to be sent\&. Exiting with a non\-zero status causes \fBgit send\-email\fR to abort before sending any e\-mails\&. +This hook is invoked by \fBgit-send-email\fR(1)\&. +.sp +It takes these command line arguments\&. They are, 1\&. the name of the file which holds the contents of the email to be sent\&. 2\&. The name of the file which holds the SMTP headers of the email\&. +.sp +The SMTP headers are passed in the exact same way as they are passed to the user\(cqs Mail Transport Agent (MTA)\&. In effect, the email given to the user\(cqs MTA, is the contents of $2 followed by the contents of $1\&. +.sp +An example of a few common headers is shown below\&. Take notice of the capitalization and multi\-line tab structure\&. +.sp +.if n \{\ +.RS 4 +.\} +.nf +From: Example <from@example\&.com> +To: to@example\&.com +Cc: cc@example\&.com, + A <author@example\&.com>, + One <one@example\&.com>, + two@example\&.com +Subject: PATCH\-STRING +.fi +.if n \{\ +.RE +.\} +.sp +Exiting with a non\-zero status causes \fBgit send\-email\fR to abort before sending any e\-mails\&. .sp The following environment variables are set when executing the hook\&. .PP diff --git a/man5/gitignore.5 b/man5/gitignore.5 index d9525d523..41023e754 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITIGNORE" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITIGNORE" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -311,7 +311,7 @@ The optional configuration variable \fBcore\&.excludesFile\fR indicates a path t .sp The purpose of gitignore files is to ensure that certain files not tracked by Git remain untracked\&. .sp -To stop tracking a file that is currently tracked, use \fIgit rm \-\-cached\fR\&. +To stop tracking a file that is currently tracked, use \fIgit rm \-\-cached\fR to remove the file from the index\&. The filename can then be added to the \fB\&.gitignore\fR file to stop the file from being reintroduced in later commits\&. .sp Git does not follow symbolic links when accessing a \fB\&.gitignore\fR file in the working tree\&. This keeps behavior consistent when the file is accessed from the index or a tree versus from the filesystem\&. .SH "EXAMPLES" diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5 index d84573cdc..b8aa50e00 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITMAILMAP" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITMAILMAP" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmodules.5 b/man5/gitmodules.5 index 5dbf49ce4..568b85bc4 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITMODULES" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITMODULES" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-capabilities.5 b/man5/gitprotocol-capabilities.5 index d29f9a214..d08853a90 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITPROTOCOL\-CAPABIL" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITPROTOCOL\-CAPABILITIES" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-common.5 b/man5/gitprotocol-common.5 index 5474916c3..6b4e30bec 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITPROTOCOL\-COMMON" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITPROTOCOL\-COMMON" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-http.5 b/man5/gitprotocol-http.5 index 2886dfc94..2eef3229a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITPROTOCOL\-HTTP" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITPROTOCOL\-HTTP" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-pack.5 b/man5/gitprotocol-pack.5 index 84a028303..21d126092 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITPROTOCOL\-PACK" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITPROTOCOL\-PACK" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitprotocol-v2.5 b/man5/gitprotocol-v2.5 index 219dba159..ececbe463 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITPROTOCOL\-V2" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITPROTOCOL\-V2" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5 index 9f76b824c..8222d03a3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITREPOSITORY\-LAYOU" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITREPOSITORY\-LAYOUT" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5 index 2774c9580..2fc6f8f3d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITWEB\&.CONF" "5" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITWEB\&.CONF" "5" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcli.7 b/man7/gitcli.7 index fc360081c..377c5d952 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITCLI" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITCLI" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcore-tutorial.7 b/man7/gitcore-tutorial.7 index 54667c018..b5da8001e 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITCORE\-TUTORIAL" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITCORE\-TUTORIAL" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcredentials.7 b/man7/gitcredentials.7 index 0e47d2892..d7391013a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITCREDENTIALS" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITCREDENTIALS" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcvs-migration.7 b/man7/gitcvs-migration.7 index ee873876d..9c0b84b93 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITCVS\-MIGRATION" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITCVS\-MIGRATION" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitdiffcore.7 b/man7/gitdiffcore.7 index 2321a0f77..7f86d1a7a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITDIFFCORE" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITDIFFCORE" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/giteveryday.7 b/man7/giteveryday.7 index d24cfa291..0d7afc08a 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITEVERYDAY" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITEVERYDAY" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -232,10 +232,16 @@ $ git tag v2\&.43 \fB(2)\fR .RE .\} .sp -\fB1. \fRadd everything under the current directory\&. -.br -\fB2. \fRmake a lightweight, unannotated tag\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +add everything under the current directory\&. +T} +\fB2.\fR\h'-2n':T{ +make a lightweight, unannotated tag\&. +T} +.TE .RE .PP Create a topic branch and develop\&. @@ -264,38 +270,53 @@ $ git log v2\&.43\&.\&. curses/ \fB(11)\fR .RE .\} .sp -\fB1. \fRcreate a new topic branch\&. -.br -\fB2. \fRrevert your botched changes in +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +create a new topic branch\&. +T} +\fB2.\fR\h'-2n':T{ +revert your botched changes in \fBcurses/ux_audio_oss\&.c\fR\&. -.br -\fB3. \fRyou need to tell Git if you added a new file; removal and modification will be caught if you do +T} +\fB3.\fR\h'-2n':T{ +you need to tell Git if you added a new file; removal and modification will be caught if you do \fBgit commit \-a\fR later\&. -.br -\fB4. \fRto see what changes you are committing\&. -.br -\fB5. \fRcommit everything, as you have tested, with your sign\-off\&. -.br -\fB6. \fRlook at all your changes including the previous commit\&. -.br -\fB7. \fRamend the previous commit, adding all your new changes, using your original message\&. -.br -\fB8. \fRswitch to the master branch\&. -.br -\fB9. \fRmerge a topic branch into your master branch\&. -.br -\fB10. \fRreview commit logs; other forms to limit output can be combined and include +T} +\fB4.\fR\h'-2n':T{ +to see what changes you are committing\&. +T} +\fB5.\fR\h'-2n':T{ +commit everything, as you have tested, with your sign\-off\&. +T} +\fB6.\fR\h'-2n':T{ +look at all your changes including the previous commit\&. +T} +\fB7.\fR\h'-2n':T{ +amend the previous commit, adding all your new changes, using your original message\&. +T} +\fB8.\fR\h'-2n':T{ +switch to the master branch\&. +T} +\fB9.\fR\h'-2n':T{ +merge a topic branch into your master branch\&. +T} +\fB10.\fR\h'-2n':T{ +review commit logs; other forms to limit output can be combined and include \fB\-10\fR (to show up to 10 commits), \fB\-\-until=2005\-12\-10\fR, etc\&. -.br -\fB11. \fRview only the changes that touch what\(cqs in +T} +\fB11.\fR\h'-2n':T{ +view only the changes that touch what\(cqs in \fBcurses/\fR directory, since \fBv2\&.43\fR tag\&. -.br +T} +.TE .RE .SH "INDIVIDUAL DEVELOPER (PARTICIPANT)" .sp @@ -401,36 +422,51 @@ $ git gc \fB(11)\fR .RE .\} .sp -\fB1. \fRcheckout a new branch +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +checkout a new branch \fBmine\fR from master\&. -.br -\fB2. \fRrepeat as needed\&. -.br -\fB3. \fRextract patches from your branch, relative to master, -.br -\fB4. \fRand email them\&. -.br -\fB5. \fRreturn to +T} +\fB2.\fR\h'-2n':T{ +repeat as needed\&. +T} +\fB3.\fR\h'-2n':T{ +extract patches from your branch, relative to master, +T} +\fB4.\fR\h'-2n':T{ +and email them\&. +T} +\fB5.\fR\h'-2n':T{ +return to \fBmaster\fR, ready to see what\(cqs new -.br -\fB6. \fR\fBgit pull\fR +T} +\fB6.\fR\h'-2n':T{ +\fBgit pull\fR fetches from \fBorigin\fR by default and merges into the current branch\&. -.br -\fB7. \fRimmediately after pulling, look at the changes done upstream since last time we checked, only in the area we are interested in\&. -.br -\fB8. \fRcheck the branch names in an external repository (if not known)\&. -.br -\fB9. \fRfetch from a specific branch +T} +\fB7.\fR\h'-2n':T{ +immediately after pulling, look at the changes done upstream since last time we checked, only in the area we are interested in\&. +T} +\fB8.\fR\h'-2n':T{ +check the branch names in an external repository (if not known)\&. +T} +\fB9.\fR\h'-2n':T{ +fetch from a specific branch \fBALL\fR from a specific repository and merge it\&. -.br -\fB10. \fRrevert the pull\&. -.br -\fB11. \fRgarbage collect leftover objects from reverted pull\&. -.br +T} +\fB10.\fR\h'-2n':T{ +revert the pull\&. +T} +\fB11.\fR\h'-2n':T{ +garbage collect leftover objects from reverted pull\&. +T} +.TE .RE .PP Push into another repository\&. @@ -460,24 +496,33 @@ mothership$ git merge satellite/master \fB(5)\fR .RE .\} .sp -\fB1. \fRmothership machine has a frotz repository under your home directory; clone from it to start a repository on the satellite machine\&. -.br -\fB2. \fRclone sets these configuration variables by default\&. It arranges +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +mothership machine has a frotz repository under your home directory; clone from it to start a repository on the satellite machine\&. +T} +\fB2.\fR\h'-2n':T{ +clone sets these configuration variables by default\&. It arranges \fBgit pull\fR to fetch and store the branches of mothership machine to local \fBremotes/origin/*\fR remote\-tracking branches\&. -.br -\fB3. \fRarrange +T} +\fB3.\fR\h'-2n':T{ +arrange \fBgit push\fR to push all local branches to their corresponding branch of the mothership machine\&. -.br -\fB4. \fRpush will stash all our work away on +T} +\fB4.\fR\h'-2n':T{ +push will stash all our work away on \fBremotes/satellite/*\fR remote\-tracking branches on the mothership machine\&. You could use this as a back\-up method\&. Likewise, you can pretend that mothership "fetched" from you (useful when access is one sided)\&. -.br -\fB5. \fRon mothership machine, merge the work done on the satellite machine into the master branch\&. -.br +T} +\fB5.\fR\h'-2n':T{ +on mothership machine, merge the work done on the satellite machine into the master branch\&. +T} +.TE .RE .PP Branch off of a specific tag\&. @@ -496,16 +541,22 @@ $ git cherry\-pick v2\&.6\&.14\&.\&.private2\&.6\&.14 \fB(2)\fR .RE .\} .sp -\fB1. \fRcreate a private branch based on a well known (but somewhat behind) tag\&. -.br -\fB2. \fRforward port all changes in +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +create a private branch based on a well known (but somewhat behind) tag\&. +T} +\fB2.\fR\h'-2n':T{ +forward port all changes in \fBprivate2\&.6\&.14\fR branch to \fBmaster\fR branch without a formal "merging"\&. Or longhand \fBgit format\-patch \-k \-m \-\-stdout v2\&.6\&.14\&.\&.private2\&.6\&.14 | git am \-3 \-k\fR -.br +T} +.TE .RE .sp An alternate participant submission mechanism is using the \fBgit request\-pull\fR or pull\-request mechanisms (e\&.g as used on GitHub (www\&.github\&.com) to notify your upstream of your contribution\&. @@ -610,37 +661,52 @@ $ git push \-\-follow\-tags ko \fB(13)\fR .RE .\} .sp -\fB1. \fRsee what you were in the middle of doing, if anything\&. -.br -\fB2. \fRsee which branches haven\(cqt been merged into +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +see what you were in the middle of doing, if anything\&. +T} +\fB2.\fR\h'-2n':T{ +see which branches haven\(cqt been merged into \fBmaster\fR yet\&. Likewise for any other integration branches e\&.g\&. \fBmaint\fR, \fBnext\fR and \fBseen\fR\&. -.br -\fB3. \fRread mails, save ones that are applicable, and save others that are not quite ready (other mail readers are available)\&. -.br -\fB4. \fRapply them, interactively, with your sign\-offs\&. -.br -\fB5. \fRcreate topic branch as needed and apply, again with sign\-offs\&. -.br -\fB6. \fRrebase internal topic branch that has not been merged to the master or exposed as a part of a stable branch\&. -.br -\fB7. \fRrestart +T} +\fB3.\fR\h'-2n':T{ +read mails, save ones that are applicable, and save others that are not quite ready (other mail readers are available)\&. +T} +\fB4.\fR\h'-2n':T{ +apply them, interactively, with your sign\-offs\&. +T} +\fB5.\fR\h'-2n':T{ +create topic branch as needed and apply, again with sign\-offs\&. +T} +\fB6.\fR\h'-2n':T{ +rebase internal topic branch that has not been merged to the master or exposed as a part of a stable branch\&. +T} +\fB7.\fR\h'-2n':T{ +restart \fBseen\fR every time from the next\&. -.br -\fB8. \fRand bundle topic branches still cooking\&. -.br -\fB9. \fRbackport a critical fix\&. -.br -\fB10. \fRcreate a signed tag\&. -.br -\fB11. \fRmake sure master was not accidentally rewound beyond that already pushed out\&. -.br -\fB12. \fRIn the output from +T} +\fB8.\fR\h'-2n':T{ +and bundle topic branches still cooking\&. +T} +\fB9.\fR\h'-2n':T{ +backport a critical fix\&. +T} +\fB10.\fR\h'-2n':T{ +create a signed tag\&. +T} +\fB11.\fR\h'-2n':T{ +make sure master was not accidentally rewound beyond that already pushed out\&. +T} +\fB12.\fR\h'-2n':T{ +In the output from \fBgit show\-branch\fR, \fBmaster\fR should have everything @@ -650,9 +716,11 @@ has, and should have everything \fBko/next\fR has, etc\&. -.br -\fB13. \fRpush out the bleeding edge, together with new tags that point into the pushed history\&. -.br +T} +\fB13.\fR\h'-2n':T{ +push out the bleeding edge, together with new tags that point into the pushed history\&. +T} +.TE .RE .sp In this example, the \fBko\fR shorthand points at the Git maintainer\(cqs repository at kernel\&.org, and looks like this: @@ -831,13 +899,19 @@ $ grep git /etc/shells \fB(2)\fR .RE .\} .sp -\fB1. \fRlog\-in shell is set to /usr/bin/git\-shell, which does not allow anything but +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +log\-in shell is set to /usr/bin/git\-shell, which does not allow anything but \fBgit push\fR and \fBgit pull\fR\&. The users require ssh access to the machine\&. -.br -\fB2. \fRin many distributions /etc/shells needs to list what is used as the login shell\&. -.br +T} +\fB2.\fR\h'-2n':T{ +in many distributions /etc/shells needs to list what is used as the login shell\&. +T} +.TE .RE .PP CVS\-style shared repository\&. @@ -872,14 +946,22 @@ refs/tags/v[0\-9]* david .RE .\} .sp -\fB1. \fRplace the developers into the same git group\&. -.br -\fB2. \fRand make the shared repository writable by the group\&. -.br -\fB3. \fRuse update\-hook example by Carl from Documentation/howto/ for branch policy control\&. -.br -\fB4. \fRalice and cindy can push into master, only bob can push into doc\-update\&. david is the release manager and is the only person who can create and push version tags\&. -.br +.TS +tab(:); +r lw(\n(.lu*75u/100u). +\fB1.\fR\h'-2n':T{ +place the developers into the same git group\&. +T} +\fB2.\fR\h'-2n':T{ +and make the shared repository writable by the group\&. +T} +\fB3.\fR\h'-2n':T{ +use update\-hook example by Carl from Documentation/howto/ for branch policy control\&. +T} +\fB4.\fR\h'-2n':T{ +alice and cindy can push into master, only bob can push into doc\-update\&. david is the release manager and is the only person who can create and push version tags\&. +T} +.TE .RE .SH "GIT" .sp diff --git a/man7/gitfaq.7 b/man7/gitfaq.7 index 9363205d5..49cf418e9 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITFAQ" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITFAQ" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index a83c2b85b..0237d363f 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITGLOSSARY" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITGLOSSARY" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitnamespaces.7 b/man7/gitnamespaces.7 index 49e7ccfe1..3c65f74b3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITNAMESPACES" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITNAMESPACES" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitremote-helpers.7 b/man7/gitremote-helpers.7 index f2b4f3b6b..67892c96d 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITREMOTE\-HELPERS" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITREMOTE\-HELPERS" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitrevisions.7 b/man7/gitrevisions.7 index ed61fd409..8b8fb3204 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITREVISIONS" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITREVISIONS" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitsubmodules.7 b/man7/gitsubmodules.7 index 647f72065..7d243afd3 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITSUBMODULES" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITSUBMODULES" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial-2.7 b/man7/gittutorial-2.7 index 4a5c508bb..b578bf631 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITTUTORIAL\-2" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITTUTORIAL\-2" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial.7 b/man7/gittutorial.7 index 48bd8c37d..5bc274bb7 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITTUTORIAL" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITTUTORIAL" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -84,7 +84,7 @@ $ git config \-\-global user\&.email you@yourdomain\&.example\&.com .sp .SH "IMPORTING A NEW PROJECT" .sp -Assume you have a tarball project\&.tar\&.gz with your initial work\&. You can place it under Git revision control as follows\&. +Assume you have a tarball \fBproject\&.tar\&.gz\fR with your initial work\&. You can place it under Git revision control as follows\&. .sp .if n \{\ .RS 4 @@ -112,9 +112,9 @@ Initialized empty Git repository in \&.git/ .\} .sp .sp -You\(cqve now initialized the working directory\(emyou may notice a new directory created, named "\&.git"\&. +You\(cqve now initialized the working directory\(emyou may notice a new directory created, named \fB\&.git\fR\&. .sp -Next, tell Git to take a snapshot of the contents of all files under the current directory (note the \fI\&.\fR), with \fIgit add\fR: +Next, tell Git to take a snapshot of the contents of all files under the current directory (note the \fB\&.\fR), with \fBgit add\fR: .sp .if n \{\ .RS 4 @@ -127,7 +127,7 @@ $ git add \&. .\} .sp .sp -This snapshot is now stored in a temporary staging area which Git calls the "index"\&. You can permanently store the contents of the index in the repository with \fIgit commit\fR: +This snapshot is now stored in a temporary staging area which Git calls the "index"\&. You can permanently store the contents of the index in the repository with \fBgit commit\fR: .sp .if n \{\ .RS 4 @@ -156,7 +156,7 @@ $ git add file1 file2 file3 .\} .sp .sp -You are now ready to commit\&. You can see what is about to be committed using \fIgit diff\fR with the \-\-cached option: +You are now ready to commit\&. You can see what is about to be committed using \fBgit diff\fR with the \fB\-\-cached\fR option: .sp .if n \{\ .RS 4 @@ -169,7 +169,7 @@ $ git diff \-\-cached .\} .sp .sp -(Without \-\-cached, \fIgit diff\fR will show you any changes that you\(cqve made but not yet added to the index\&.) You can also get a brief summary of the situation with \fIgit status\fR: +(Without \fB\-\-cached\fR, \fBgit diff\fR will show you any changes that you\(cqve made but not yet added to the index\&.) You can also get a brief summary of the situation with \fBgit status\fR: .sp .if n \{\ .RS 4 @@ -178,7 +178,6 @@ $ git diff \-\-cached $ git status On branch master Changes to be committed: -Your branch is up to date with \*(Aqorigin/master\*(Aq\&. (use "git restore \-\-staged <file>\&.\&.\&." to unstage) modified: file1 @@ -205,7 +204,7 @@ $ git commit .sp This will again prompt you for a message describing the change, and then record a new version of the project\&. .sp -Alternatively, instead of running \fIgit add\fR beforehand, you can use +Alternatively, instead of running \fBgit add\fR beforehand, you can use .sp .if n \{\ .RS 4 @@ -223,7 +222,7 @@ which will automatically notice any modified (but not new) files, add them to th A note on commit messages: Though not required, it\(cqs a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description\&. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git\&. For example, \fBgit-format-patch\fR(1) turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body\&. .SH "GIT TRACKS CONTENT NOT FILES" .sp -Many revision control systems provide an \fBadd\fR command that tells the system to start tracking changes to a new file\&. Git\(cqs \fBadd\fR command does something simpler and more powerful: \fIgit add\fR is used both for new and newly modified files, and in both cases it takes a snapshot of the given files and stages that content in the index, ready for inclusion in the next commit\&. +Many revision control systems provide an \fBadd\fR command that tells the system to start tracking changes to a new file\&. Git\(cqs \fBadd\fR command does something simpler and more powerful: \fBgit add\fR is used both for new and newly modified files, and in both cases it takes a snapshot of the given files and stages that content in the index, ready for inclusion in the next commit\&. .SH "VIEWING PROJECT HISTORY" .sp At any point you can view the history of your changes using @@ -266,7 +265,7 @@ $ git log \-\-stat \-\-summary .sp .SH "MANAGING BRANCHES" .sp -A single Git repository can maintain multiple branches of development\&. To create a new branch named "experimental", use +A single Git repository can maintain multiple branches of development\&. To create a new branch named \fBexperimental\fR, use .sp .if n \{\ .RS 4 @@ -306,7 +305,7 @@ you\(cqll get a list of all existing branches: .\} .sp .sp -The "experimental" branch is the one you just created, and the "master" branch is a default branch that was created for you automatically\&. The asterisk marks the branch you are currently on; type +The \fBexperimental\fR branch is the one you just created, and the \fBmaster\fR branch is a default branch that was created for you automatically\&. The asterisk marks the branch you are currently on; type .sp .if n \{\ .RS 4 @@ -319,7 +318,7 @@ $ git switch experimental .\} .sp .sp -to switch to the experimental branch\&. Now edit a file, commit the change, and switch back to the master branch: +to switch to the \fBexperimental\fR branch\&. Now edit a file, commit the change, and switch back to the \fBmaster\fR branch: .sp .if n \{\ .RS 4 @@ -334,9 +333,9 @@ $ git switch master .\} .sp .sp -Check that the change you made is no longer visible, since it was made on the experimental branch and you\(cqre back on the master branch\&. +Check that the change you made is no longer visible, since it was made on the \fBexperimental\fR branch and you\(cqre back on the \fBmaster\fR branch\&. .sp -You can make a different change on the master branch: +You can make a different change on the \fBmaster\fR branch: .sp .if n \{\ .RS 4 @@ -350,7 +349,7 @@ $ git commit \-a .\} .sp .sp -at this point the two branches have diverged, with different changes made in each\&. To merge the changes made in experimental into master, run +at this point the two branches have diverged, with different changes made in each\&. To merge the changes made in \fBexperimental\fR into \fBmaster\fR, run .sp .if n \{\ .RS 4 @@ -404,7 +403,7 @@ $ gitk .sp will show a nice graphical representation of the resulting history\&. .sp -At this point you could delete the experimental branch with +At this point you could delete the \fBexperimental\fR branch with .sp .if n \{\ .RS 4 @@ -417,9 +416,9 @@ $ git branch \-d experimental .\} .sp .sp -This command ensures that the changes in the experimental branch are already in the current branch\&. +This command ensures that the changes in the \fBexperimental\fR branch are already in the current branch\&. .sp -If you develop on a branch crazy\-idea, then regret it, you can always delete the branch with +If you develop on a branch \fBcrazy\-idea\fR, then regret it, you can always delete the branch with .sp .if n \{\ .RS 4 @@ -435,7 +434,7 @@ $ git branch \-D crazy\-idea Branches are cheap and easy, so this is a good way to try something out\&. .SH "USING GIT FOR COLLABORATION" .sp -Suppose that Alice has started a new project with a Git repository in /home/alice/project, and that Bob, who has a home directory on the same machine, wants to contribute\&. +Suppose that Alice has started a new project with a Git repository in \fB/home/alice/project\fR, and that Bob, who has a home directory on the same machine, wants to contribute\&. .sp Bob begins with: .sp @@ -450,7 +449,7 @@ bob$ git clone /home/alice/project myrepo .\} .sp .sp -This creates a new directory "myrepo" containing a clone of Alice\(cqs repository\&. The clone is on an equal footing with the original project, possessing its own copy of the original project\(cqs history\&. +This creates a new directory \fBmyrepo\fR containing a clone of Alice\(cqs repository\&. The clone is on an equal footing with the original project, possessing its own copy of the original project\(cqs history\&. .sp Bob then makes some changes and commits them: .sp @@ -467,7 +466,7 @@ bob$ git commit \-a .\} .sp .sp -When he\(cqs ready, he tells Alice to pull changes from the repository at /home/bob/myrepo\&. She does this with: +When he\(cqs ready, he tells Alice to pull changes from the repository at \fB/home/bob/myrepo\fR\&. She does this with: .sp .if n \{\ .RS 4 @@ -481,13 +480,13 @@ alice$ git pull /home/bob/myrepo master .\} .sp .sp -This merges the changes from Bob\(cqs "master" branch into Alice\(cqs current branch\&. If Alice has made her own changes in the meantime, then she may need to manually fix any conflicts\&. +This merges the changes from Bob\(cqs \fBmaster\fR branch into Alice\(cqs current branch\&. If Alice has made her own changes in the meantime, then she may need to manually fix any conflicts\&. .sp -The "pull" command thus performs two operations: it fetches changes from a remote branch, then merges them into the current branch\&. +The \fBpull\fR command thus performs two operations: it fetches changes from a remote branch, then merges them into the current branch\&. .sp -Note that in general, Alice would want her local changes committed before initiating this "pull"\&. If Bob\(cqs work conflicts with what Alice did since their histories forked, Alice will use her working tree and the index to resolve conflicts, and existing local changes will interfere with the conflict resolution process (Git will still perform the fetch but will refuse to merge \(em Alice will have to get rid of her local changes in some way and pull again when this happens)\&. +Note that in general, Alice would want her local changes committed before initiating this \fBpull\fR\&. If Bob\(cqs work conflicts with what Alice did since their histories forked, Alice will use her working tree and the index to resolve conflicts, and existing local changes will interfere with the conflict resolution process (Git will still perform the fetch but will refuse to merge \(em Alice will have to get rid of her local changes in some way and pull again when this happens)\&. .sp -Alice can peek at what Bob did without merging first, using the "fetch" command; this allows Alice to inspect what Bob did, using a special symbol "FETCH_HEAD", in order to determine if he has anything worth pulling, like this: +Alice can peek at what Bob did without merging first, using the \fBfetch\fR command; this allows Alice to inspect what Bob did, using a special symbol \fBFETCH_HEAD\fR, in order to determine if he has anything worth pulling, like this: .sp .if n \{\ .RS 4 @@ -501,7 +500,7 @@ alice$ git log \-p HEAD\&.\&.FETCH_HEAD .\} .sp .sp -This operation is safe even if Alice has uncommitted local changes\&. The range notation "HEAD\&.\&.FETCH_HEAD" means "show everything that is reachable from the FETCH_HEAD but exclude anything that is reachable from HEAD"\&. Alice already knows everything that leads to her current state (HEAD), and reviews what Bob has in his state (FETCH_HEAD) that she has not seen with this command\&. +This operation is safe even if Alice has uncommitted local changes\&. The range notation \fBHEAD\&.\&.FETCH_HEAD\fR means "show everything that is reachable from the \fBFETCH_HEAD\fR but exclude anything that is reachable from \fBHEAD\fR"\&. Alice already knows everything that leads to her current state (\fBHEAD\fR), and reviews what Bob has in his state (\fBFETCH_HEAD\fR) that she has not seen with this command\&. .sp If Alice wants to visualize what Bob did since their histories forked she can issue the following command: .sp @@ -516,7 +515,7 @@ $ gitk HEAD\&.\&.FETCH_HEAD .\} .sp .sp -This uses the same two\-dot range notation we saw earlier with \fIgit log\fR\&. +This uses the same two\-dot range notation we saw earlier with \fBgit log\fR\&. .sp Alice may want to view what both of them did since they forked\&. She can use three\-dot form instead of the two\-dot form: .sp @@ -533,9 +532,9 @@ $ gitk HEAD\&.\&.\&.FETCH_HEAD .sp This means "show everything that is reachable from either one, but exclude anything that is reachable from both of them"\&. .sp -Please note that these range notation can be used with both gitk and "git log"\&. +Please note that these range notation can be used with both \fBgitk\fR and \fBgit log\fR\&. .sp -After inspecting what Bob did, if there is nothing urgent, Alice may decide to continue working without pulling from Bob\&. If Bob\(cqs history does have something Alice would immediately need, Alice may choose to stash her work\-in\-progress first, do a "pull", and then finally unstash her work\-in\-progress on top of the resulting history\&. +After inspecting what Bob did, if there is nothing urgent, Alice may decide to continue working without pulling from Bob\&. If Bob\(cqs history does have something Alice would immediately need, Alice may choose to stash her work\-in\-progress first, do a \fBpull\fR, and then finally unstash her work\-in\-progress on top of the resulting history\&. .sp When you are working in a small closely knit group, it is not unusual to interact with the same repository over and over again\&. By defining \fIremote\fR repository shorthand, you can make it easier: .sp @@ -550,7 +549,7 @@ alice$ git remote add bob /home/bob/myrepo .\} .sp .sp -With this, Alice can perform the first part of the "pull" operation alone using the \fIgit fetch\fR command without merging them with her own branch, using: +With this, Alice can perform the first part of the \fBpull\fR operation alone using the \fBgit fetch\fR command without merging them with her own branch, using: .sp .if n \{\ .RS 4 @@ -563,7 +562,7 @@ alice$ git fetch bob .\} .sp .sp -Unlike the longhand form, when Alice fetches from Bob using a remote repository shorthand set up with \fIgit remote\fR, what was fetched is stored in a remote\-tracking branch, in this case \fBbob/master\fR\&. So after this: +Unlike the longhand form, when Alice fetches from Bob using a remote repository shorthand set up with \fBgit remote\fR, what was fetched is stored in a remote\-tracking branch, in this case \fBbob/master\fR\&. So after this: .sp .if n \{\ .RS 4 @@ -576,9 +575,9 @@ alice$ git log \-p master\&.\&.bob/master .\} .sp .sp -shows a list of all the changes that Bob made since he branched from Alice\(cqs master branch\&. +shows a list of all the changes that Bob made since he branched from Alice\(cqs \fBmaster\fR branch\&. .sp -After examining those changes, Alice could merge the changes into her master branch: +After examining those changes, Alice could merge the changes into her \fBmaster\fR branch: .sp .if n \{\ .RS 4 @@ -633,9 +632,9 @@ bob$ git config \-\-get remote\&.origin\&.url .\} .sp .sp -(The complete configuration created by \fIgit clone\fR is visible using \fBgit config \-l\fR, and the \fBgit-config\fR(1) man page explains the meaning of each option\&.) +(The complete configuration created by \fBgit clone\fR is visible using \fBgit config \-l\fR, and the \fBgit-config\fR(1) man page explains the meaning of each option\&.) .sp -Git also keeps a pristine copy of Alice\(cqs master branch under the name "origin/master": +Git also keeps a pristine copy of Alice\(cqs \fBmaster\fR branch under the name \fBorigin/master\fR: .sp .if n \{\ .RS 4 @@ -667,7 +666,7 @@ Alternatively, Git has a native protocol, or can use http; see \fBgit-pull\fR(1) Git can also be used in a CVS\-like mode, with a central repository that various users push changes to; see \fBgit-push\fR(1) and \fBgitcvs-migration\fR(7)\&. .SH "EXPLORING HISTORY" .sp -Git history is represented as a series of interrelated commits\&. We have already seen that the \fIgit log\fR command can list those commits\&. Note that first line of each git log entry also gives a name for the commit: +Git history is represented as a series of interrelated commits\&. We have already seen that the \fBgit log\fR command can list those commits\&. Note that first line of each \fBgit log\fR entry also gives a name for the commit: .sp .if n \{\ .RS 4 @@ -685,7 +684,7 @@ Date: Tue May 16 17:18:22 2006 \-0700 .\} .sp .sp -We can give this name to \fIgit show\fR to see the details about this commit\&. +We can give this name to \fBgit show\fR to see the details about this commit\&. .sp .if n \{\ .RS 4 @@ -756,7 +755,7 @@ $ git tag v2\&.5 1b2e1d63ff .\} .sp .sp -you can refer to 1b2e1d63ff by the name "v2\&.5"\&. If you intend to share this name with other people (for example, to identify a release version), you should create a "tag" object, and perhaps sign it; see \fBgit-tag\fR(1) for details\&. +you can refer to \fB1b2e1d63ff\fR by the name \fBv2\&.5\fR\&. If you intend to share this name with other people (for example, to identify a release version), you should create a "tag" object, and perhaps sign it; see \fBgit-tag\fR(1) for details\&. .sp Any Git command that needs to know a commit can take any of these names\&. For example: .sp @@ -775,9 +774,9 @@ $ git reset \-\-hard HEAD^ # reset your current branch and working .\} .sp .sp -Be careful with that last command: in addition to losing any changes in the working directory, it will also remove all later commits from this branch\&. If this branch is the only branch containing those commits, they will be lost\&. Also, don\(cqt use \fIgit reset\fR on a publicly\-visible branch that other developers pull from, as it will force needless merges on other developers to clean up the history\&. If you need to undo changes that you have pushed, use \fIgit revert\fR instead\&. +Be careful with that last command: in addition to losing any changes in the working directory, it will also remove all later commits from this branch\&. If this branch is the only branch containing those commits, they will be lost\&. Also, don\(cqt use \fBgit reset\fR on a publicly\-visible branch that other developers pull from, as it will force needless merges on other developers to clean up the history\&. If you need to undo changes that you have pushed, use \fBgit revert\fR instead\&. .sp -The \fIgit grep\fR command can search for strings in any version of your project, so +The \fBgit grep\fR command can search for strings in any version of your project, so .sp .if n \{\ .RS 4 @@ -790,9 +789,9 @@ $ git grep "hello" v2\&.5 .\} .sp .sp -searches for all occurrences of "hello" in v2\&.5\&. +searches for all occurrences of "hello" in \fBv2\&.5\fR\&. .sp -If you leave out the commit name, \fIgit grep\fR will search any of the files it manages in your current directory\&. So +If you leave out the commit name, \fBgit grep\fR will search any of the files it manages in your current directory\&. So .sp .if n \{\ .RS 4 @@ -807,7 +806,7 @@ $ git grep "hello" .sp is a quick way to search just the files that are tracked by Git\&. .sp -Many Git commands also take sets of commits, which can be specified in a number of ways\&. Here are some examples with \fIgit log\fR: +Many Git commands also take sets of commits, which can be specified in a number of ways\&. Here are some examples with \fBgit log\fR: .sp .if n \{\ .RS 4 @@ -824,7 +823,7 @@ $ git log v2\&.5\&.\&. Makefile # commits since v2\&.5 which modify .\} .sp .sp -You can also give \fIgit log\fR a "range" of commits where the first is not necessarily an ancestor of the second; for example, if the tips of the branches "stable" and "master" diverged from a common commit some time ago, then +You can also give \fBgit log\fR a "range" of commits where the first is not necessarily an ancestor of the second; for example, if the tips of the branches \fBstable\fR and \fBmaster\fR diverged from a common commit some time ago, then .sp .if n \{\ .RS 4 @@ -837,7 +836,7 @@ $ git log stable\&.\&.master .\} .sp .sp -will list commits made in the master branch but not in the stable branch, while +will list commits made in the \fBmaster\fR branch but not in the stable branch, while .sp .if n \{\ .RS 4 @@ -850,11 +849,11 @@ $ git log master\&.\&.stable .\} .sp .sp -will show the list of commits made on the stable branch but not the master branch\&. +will show the list of commits made on the stable branch but not the \fBmaster\fR branch\&. .sp -The \fIgit log\fR command has a weakness: it must present commits in a list\&. When the history has lines of development that diverged and then merged back together, the order in which \fIgit log\fR presents those commits is meaningless\&. +The \fBgit log\fR command has a weakness: it must present commits in a list\&. When the history has lines of development that diverged and then merged back together, the order in which \fBgit log\fR presents those commits is meaningless\&. .sp -Most projects with multiple contributors (such as the Linux kernel, or Git itself) have frequent merges, and \fIgitk\fR does a better job of visualizing their history\&. For example, +Most projects with multiple contributors (such as the Linux kernel, or Git itself) have frequent merges, and \fBgitk\fR does a better job of visualizing their history\&. For example, .sp .if n \{\ .RS 4 @@ -867,7 +866,7 @@ $ gitk \-\-since="2 weeks ago" drivers/ .\} .sp .sp -allows you to browse any commits from the last 2 weeks of commits that modified files under the "drivers" directory\&. (Note: you can adjust gitk\(cqs fonts by holding down the control key while pressing "\-" or "+"\&.) +allows you to browse any commits from the last 2 weeks of commits that modified files under the \fBdrivers\fR directory\&. (Note: you can adjust gitk\(cqs fonts by holding down the control key while pressing "\-" or "+"\&.) .sp Finally, most commands that take filenames will optionally allow you to precede any filename by a commit, to specify a particular version of the file: .sp @@ -882,7 +881,7 @@ $ git diff v2\&.5:Makefile HEAD:Makefile\&.in .\} .sp .sp -You can also use \fIgit show\fR to see any such file: +You can also use \fBgit show\fR to see any such file: .sp .if n \{\ .RS 4 @@ -944,7 +943,9 @@ If you don\(cqt want to continue with that right away, a few other digressions t .sp -1 .IP \(bu 2.3 .\} -\fBgit-bisect\fR(1): When there is a regression in your project, one way to track down the bug is by searching through the history to find the exact commit that\(cqs to blame\&. Git bisect can help you perform a binary search for that commit\&. It is smart enough to perform a close\-to\-optimal search even in the case of complex non\-linear history with lots of merged branches\&. +\fBgit-bisect\fR(1): When there is a regression in your project, one way to track down the bug is by searching through the history to find the exact commit that\(cqs to blame\&. +\fBgit bisect\fR +can help you perform a binary search for that commit\&. It is smart enough to perform a close\-to\-optimal search even in the case of complex non\-linear history with lots of merged branches\&. .RE .sp .RS 4 diff --git a/man7/gitworkflows.7 b/man7/gitworkflows.7 index 678669929..47e3735aa 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-05-09 +.\" Date: 2023-05-10 .\" Manual: Git Manual -.\" Source: Git 2.40.1.515.g5597cfdf47 +.\" Source: Git 2.40.1.552.g91428f078b .\" Language: English .\" -.TH "GITWORKFLOWS" "7" "2023\-05\-09" "Git 2\&.40\&.1\&.515\&.g5597cf" "Git Manual" +.TH "GITWORKFLOWS" "7" "2023\-05\-10" "Git 2\&.40\&.1\&.552\&.g91428f" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |