diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-18 13:40:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 13:40:36 -0700 |
| commit | 3ae17aff99c1286e503780942672dd4827e12f0d (patch) | |
| tree | 840d1a22a77de2cd8fe80fe4adbb1d00fb64e2ab | |
| parent | bff77782ba91cc59329606a7e691e44166952534 (diff) | |
| download | git-manpages-3ae17aff99c1286e503780942672dd4827e12f0d.tar.gz | |
Autogenerated manpages for v2.37.1-188-g71a8f
182 files changed, 1055 insertions, 651 deletions
diff --git a/man1/git-add.1 b/man1/git-add.1 index e10114d20..0a626e861 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-ADD" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-ADD" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-am.1 b/man1/git-am.1 index 883dae6b4..3ddea5e90 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-AM" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-AM" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index edb35b3f6..f46fceb05 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 545c5103a..d13c09f2b 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-APPLY" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-APPLY" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index c85a47e1a..b39b8e0a5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index eb84ecbb6..fab5dd49f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index 1701fee3f..f47e44640 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-BISECT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-BISECT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index 9bcddb44f..b657ec07b 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-BLAME" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-BLAME" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 82c212463..72626d298 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-BRANCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index db136f12a..ffdd8013c 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index e78e0966c..f062a4769 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-BUNDLE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index 18a571bb1..ab1aca19d 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 6acb27d73..348bd1e64 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index 5eba33df0..5a173f50d 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index 93b6dd993..d86958916 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 643d3cf31..476cd9a38 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FOR" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHECK\-REF\-FOR" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 010fead57..e881417c3 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index 57ba704c8..9636cf838 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 992b85a85..dda32a7e1 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index 9f265efc0..49807ef74 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CHERRY" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index bad168e0d..7c0335053 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CITOOL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index ade159c9a..52a7b105f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CLEAN" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clone.1 b/man1/git-clone.1 index ae7e515ab..f10c43d48 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CLONE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CLONE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-column.1 b/man1/git-column.1 index 550fe330f..6ca740d16 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-COLUMN" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index a5ee64605..dfec7e8da 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 7bd1c7d9c..0ffa54b10 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 601ca5293..fa6f28d27 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-COMMIT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-config.1 b/man1/git-config.1 index e0bb9bdbf..807770a2e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CONFIG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1933,15 +1933,61 @@ are supported\&. .PP core\&.bigFileThreshold .RS 4 -Files larger than this size are stored deflated, without attempting delta compression\&. Storing large files without delta compression avoids excessive memory usage, at the slight expense of increased disk usage\&. Additionally files larger than this size are always treated as binary\&. -.sp -Default is 512 MiB on all platforms\&. This should be reasonable for most projects as source code and other text files can still be delta compressed, but larger binary media files won\(cqt be\&. -.sp -Common unit suffixes of +The size of files considered "big", which as discussed below changes the behavior of numerous git commands, as well as how such files are stored within the repository\&. The default is 512 MiB\&. Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported\&. +.sp +Files above the configured limit will be: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Stored deflated in packfiles, without attempting delta compression\&. +.sp +The default limit is primarily set with this use\-case in mind\&. With it, most projects will have their source code and other text files delta compressed, but not larger binary media files\&. +.sp +Storing large files without delta compression avoids excessive memory usage, at the slight expense of increased disk usage\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Will be treated as if they were labeled "binary" (see +\fBgitattributes\fR(5))\&. e\&.g\&. +\fBgit-log\fR(1) +and +\fBgit-diff\fR(1) +will not compute diffs for files above this limit\&. +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +Will generally be streamed when written, which avoids excessive memory usage, at the cost of some fixed overhead\&. Commands that make use of this include +\fBgit-archive\fR(1), +\fBgit-fast-import\fR(1), +\fBgit-index-pack\fR(1), +\fBgit-unpack-objects\fR(1) +and +\fBgit-fsck\fR(1)\&. +.RE .RE .PP core\&.excludesFile @@ -7564,6 +7610,13 @@ push\&.negotiate If set to "true", attempt to reduce the size of the packfile sent by rounds of negotiation in which the client and the server attempt to find commits in common\&. If "false", Git will rely solely on the server\(cqs ref advertisement to find commits in common\&. .RE .PP +push\&.useBitmaps +.RS 4 +If set to "false", disable use of bitmaps for "git push" even if +\fBpack\&.useBitmaps\fR +is "true", without preventing other git operations from using bitmaps\&. Default is true\&. +.RE +.PP rebase\&.backend .RS 4 Default backend to use for rebasing\&. Possible choices are diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index f6ad1c756..bd669a6a3 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index 18bbcec3a..e39d13c16 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CREDENTIAL\-CAC" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index 6ed0a0446..96037e6b5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CAC" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CREDENTIAL\-CAC" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index 5b2dee217..8fe2c2d39 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STO" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CREDENTIAL\-STO" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential.1 b/man1/git-credential.1 index 2ce587d0f..d98515cb0 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index 3b492e6b2..89cc48da9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index c31a48869..8d8fb5d8c 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index 8ad9211af..64c1febd5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index 2d266fcd8..c3fe9c66f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DAEMON" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-describe.1 b/man1/git-describe.1 index 0163b033c..dc3c48f2e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 5134617a5..89d4f3386 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 7fb58589e..4aeceaa7a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 9533546b5..bd2960d12 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff.1 b/man1/git-diff.1 index bd328a5ac..68542e7f9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DIFF" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DIFF" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index 9d6aa4136..81074d5b9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index 022ec78c7..4b7c72def 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 793a59689..db7927520 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index 8de71eee9..0e6da25a3 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index 384ed5c00..2dd036a83 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FETCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FETCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index de0267aad..6579c3fba 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index 2ba1d6c2b..1cee687e6 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index 771861f32..44c306599 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 1314af8ab..9a809b041 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index c988e6729..df349b9b5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index ea45c6777..de4d72c3a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index 83eba1855..00ed564f5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FSCK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FSCK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsmonitor--daemon.1 b/man1/git-fsmonitor--daemon.1 index 8d736d111..028231fe2 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-FSMONITOR\-\-DA" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-FSMONITOR\-\-DA" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 59f61faf5..356120b3e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-GC" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-GC" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "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 f71e12aa0..af1e974a9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMI" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMI" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 68a7631a1..233da7607 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-GREP" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-GREP" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -46,6 +46,7 @@ git-grep \- Print lines matching a pattern [\-\-break] [\-\-heading] [\-p | \-\-show\-function] [\-A <post\-context>] [\-B <pre\-context>] [\-C <context>] [\-W | \-\-function\-context] + [(\-m | \-\-max\-count) <num>] [\-\-threads <num>] [\-f <file>] [\-e] <pattern> [\-\-and|\-\-or|\-\-not|(|)|\-e <pattern>\&...] @@ -292,6 +293,15 @@ in \fBgitattributes\fR(5))\&. .RE .PP +\-m <num>, \-\-max\-count <num> +.RS 4 +Limit the amount of matches per file\&. When using the +\fB\-v\fR +or +\fB\-\-invert\-match\fR +option, the search stops after the specified number of non\-matches\&. A value of \-1 will return unlimited results (the default)\&. A value of 0 will exit immediately with a non\-zero status\&. +.RE +.PP \-\-threads <num> .RS 4 Number of grep worker threads to use\&. See diff --git a/man1/git-gui.1 b/man1/git-gui.1 index 34179e6fb..8296cdd55 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-GUI" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-GUI" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index 8338912a8..f14d18c5e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-help.1 b/man1/git-help.1 index ac7bd5f4f..349c44e0f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-HELP" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-HELP" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hook.1 b/man1/git-hook.1 index 53c2e8d9a..9c0849fd1 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-HOOK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-HOOK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index d958e21ea..e742de8a7 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index 6e0758dda..de168534c 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index 5bf6bf9c8..99fcd62ef 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index ddc25e2a2..8faeff8df 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index 595d9c48b..0c82d8b05 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index abe872f08..152efff17 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index 35fe9295a..57e246993 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-INIT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-INIT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index bd154b64a..005b180c4 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index 615eaf1c7..b3a758d7e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAI" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-INTERPRET\-TRAI" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-log.1 b/man1/git-log.1 index 7b8daa201..f1dcbc4f9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-LOG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-LOG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index a76b2f0b6..1a4151394 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index e2cb0c82c..50093cde3 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 32ac5878c..a95c2a7d9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index caba6fefd..ef040ed59 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MAILINFO" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index b5f1ca374..d47a7f860 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index 43f51f179..9bb01adb0 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index 455d1d76c..a73e95893 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index ae0c769db..cf69f76b4 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-index.1 b/man1/git-merge-index.1 index f6f8bbdb5..82f0f54b5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGE\-INDEX" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGE\-INDEX" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-one-file.1 b/man1/git-merge-one-file.1 index 210204882..721568b36 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGE\-ONE\-FIL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGE\-ONE\-FIL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-tree.1 b/man1/git-merge-tree.1 index 36704bcd4..21d0fb436 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGE\-TREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGE\-TREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -28,18 +28,278 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -git-merge-tree \- Show three\-way merge without touching index +git-merge-tree \- Perform merge without touching index or working tree .SH "SYNOPSIS" .sp .nf -\fIgit merge\-tree\fR <base\-tree> <branch1> <branch2> +\fIgit merge\-tree\fR [\-\-write\-tree] [<options>] <branch1> <branch2> +\fIgit merge\-tree\fR [\-\-trivial\-merge] <base\-tree> <branch1> <branch2> (deprecated) .fi .sp .SH "DESCRIPTION" .sp -Reads three tree\-ish, and output trivial merge results and conflicting stages to the standard output\&. This is similar to what three\-way \fIgit read\-tree \-m\fR does, but instead of storing the results in the index, the command outputs the entries to the standard output\&. +This command has a modern \fB\-\-write\-tree\fR mode and a deprecated \fB\-\-trivial\-merge\fR mode\&. With the exception of the DEPRECATED DESCRIPTION section at the end, the rest of this documentation describes modern \fB\-\-write\-tree\fR mode\&. .sp -This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index\&. For this reason, the output from the command omits entries that match the <branch1> tree\&. +Performs a merge, but does not make any new commits and does not read from or write to either the working tree or index\&. +.sp +The performed merge will use the same feature as the "real" \fBgit-merge\fR(1), including: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +three way content merges of individual files +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +rename detection +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +proper directory/file conflict handling +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +recursive ancestor consolidation (i\&.e\&. when there is more than one merge base, creating a virtual merge base by merging the merge bases) +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +etc\&. +.RE +.sp +After the merge completes, a new toplevel tree object is created\&. See \fBOUTPUT\fR below for details\&. +.SH "OPTIONS" +.PP +\-z +.RS 4 +Do not quote filenames in the <Conflicted file info> section, and end each filename with a NUL character rather than newline\&. Also begin the messages section with a NUL character instead of a newline\&. See +the section called \(lqOUTPUT\(rq +below for more information\&. +.RE +.PP +\-\-name\-only +.RS 4 +In the Conflicted file info section, instead of writing a list of (mode, oid, stage, path) tuples to output for conflicted files, just provide a list of filenames with conflicts (and do not list filenames multiple times if they have multiple conflicting stages)\&. +.RE +.PP +\-\-[no\-]messages +.RS 4 +Write any informational messages such as "Auto\-merging <path>" or CONFLICT notices to the end of stdout\&. If unspecified, the default is to include these messages if there are merge conflicts, and to omit them otherwise\&. +.RE +.PP +\-\-allow\-unrelated\-histories +.RS 4 +merge\-tree will by default error out if the two branches specified share no common history\&. This flag can be given to override that check and make the merge proceed anyway\&. +.RE +.SH "OUTPUT" +.sp +For a successful merge, the output from git\-merge\-tree is simply one line: +.sp +.if n \{\ +.RS 4 +.\} +.nf +<OID of toplevel tree> +.fi +.if n \{\ +.RE +.\} +.sp +Whereas for a conflicted merge, the output is by default of the form: +.sp +.if n \{\ +.RS 4 +.\} +.nf +<OID of toplevel tree> +<Conflicted file info> +<Informational messages> +.fi +.if n \{\ +.RE +.\} +.sp +These are discussed individually below\&. +.SS "OID of toplevel tree" +.sp +This is a tree object that represents what would be checked out in the working tree at the end of \fBgit merge\fR\&. If there were conflicts, then files within this tree may have embedded conflict markers\&. This section is always followed by a newline (or NUL if \fB\-z\fR is passed)\&. +.SS "Conflicted file info" +.sp +This is a sequence of lines with the format +.sp +.if n \{\ +.RS 4 +.\} +.nf +<mode> <object> <stage> <filename> +.fi +.if n \{\ +.RE +.\} +.sp +The filename will be quoted as explained for the configuration variable \fBcore\&.quotePath\fR (see \fBgit-config\fR(1))\&. However, if the \fB\-\-name\-only\fR option is passed, the mode, object, and stage will be omitted\&. If \fB\-z\fR is passed, the "lines" are terminated by a NUL character instead of a newline character\&. +.SS "Informational messages" +.sp +This always starts with a blank line (or NUL if \fB\-z\fR is passed) to separate it from the previous sections, and then has free\-form messages about the merge, such as: +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +"Auto\-merging <file>" +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +"CONFLICT (rename/delete): <oldfile> renamed\&...but deleted in\&..." +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +"Failed to merge submodule <submodule> (<reason>)" +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +"Warning: cannot merge binary files: <filename>" +.RE +.sp +Note that these free\-form messages will never have a NUL character in or between them, even if \-z is passed\&. It is simply a large block of text taking up the remainder of the output\&. +.SH "EXIT STATUS" +.sp +For a successful, non\-conflicted merge, the exit status is 0\&. When the merge has conflicts, the exit status is 1\&. If the merge is not able to complete (or start) due to some kind of error, the exit status is something other than 0 or 1 (and the output is unspecified)\&. +.SH "USAGE NOTES" +.sp +This command is intended as low\-level plumbing, similar to \fBgit-hash-object\fR(1), \fBgit-mktree\fR(1), \fBgit-commit-tree\fR(1), \fBgit-write-tree\fR(1), \fBgit-update-ref\fR(1), and \fBgit-mktag\fR(1)\&. Thus, it can be used as a part of a series of steps such as: +.sp +.if n \{\ +.RS 4 +.\} +.nf +NEWTREE=$(git merge\-tree \-\-write\-tree $BRANCH1 $BRANCH2) +test $? \-eq 0 || die "There were conflicts\&.\&.\&." +NEWCOMMIT=$(git commit\-tree $NEWTREE \-p $BRANCH1 \-p $BRANCH2) +git update\-ref $BRANCH1 $NEWCOMMIT +.fi +.if n \{\ +.RE +.\} +.sp +Note that when the exit status is non\-zero, \fBNEWTREE\fR in this sequence will contain a lot more output than just a tree\&. +.sp +For conflicts, the output includes the same information that you\(cqd get with \fBgit-merge\fR(1): +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +what would be written to the working tree (the +OID of toplevel tree) +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +the higher order stages that would be written to the index (the +Conflicted file info) +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +any messages that would have been printed to stdout (the +Informational messages) +.RE +.SH "MISTAKES TO AVOID" +.sp +Do NOT look through the resulting toplevel tree to try to find which files conflict; parse the Conflicted file info section instead\&. Not only would parsing an entire tree be horrendously slow in large repositories, there are numerous types of conflicts not representable by conflict markers (modify/delete, mode conflict, binary file changed on both sides, file/directory conflicts, various rename conflict permutations, etc\&.) +.sp +Do NOT interpret an empty Conflicted file info list as a clean merge; check the exit status\&. A merge can have conflicts without having individual files conflict (there are a few types of directory rename conflicts that fall into this category, and others might also be added in the future)\&. +.sp +Do NOT attempt to guess or make the user guess the conflict types from the Conflicted file info list\&. The information there is insufficient to do so\&. For example: Rename/rename(1to2) conflicts (both sides renamed the same file differently) will result in three different file having higher order stages (but each only has one higher order stage), with no way (short of the Informational messages section) to determine which three files are related\&. File/directory conflicts also result in a file with exactly one higher order stage\&. Possibly\-involved\-in\-directory\-rename conflicts (when "merge\&.directoryRenames" is unset or set to "conflicts") also result in a file with exactly one higher order stage\&. In all cases, the Informational messages section has the necessary info, though it is not designed to be machine parseable\&. +.sp +Do NOT assume that each paths from Conflicted file info, and the logical conflicts in the Informational messages have a one\-to\-one mapping, nor that there is a one\-to\-many mapping, nor a many\-to\-one mapping\&. Many\-to\-many mappings exist, meaning that each path can have many logical conflict types in a single merge, and each logical conflict type can affect many paths\&. +.sp +Do NOT assume all filenames listed in the Informational messages section had conflicts\&. Messages can be included for files that have no conflicts, such as "Auto\-merging <file>"\&. +.sp +AVOID taking the OIDS from the Conflicted file info and re\-merging them to present the conflicts to the user\&. This will lose information\&. Instead, look up the version of the file found within the OID of toplevel tree and show that instead\&. In particular, the latter will have conflict markers annotated with the original branch/commit being merged and, if renames were involved, the original filename\&. While you could include the original branch/commit in the conflict marker annotations when re\-merging, the original filename is not available from the Conflicted file info and thus you would be losing information that might help the user resolve the conflict\&. +.SH "DEPRECATED DESCRIPTION" +.sp +Per the DESCRIPTION and unlike the rest of this documentation, this section describes the deprecated \fB\-\-trivial\-merge\fR mode\&. +.sp +Other than the optional \fB\-\-trivial\-merge\fR, this mode accepts no options\&. +.sp +This mode reads three tree\-ish, and outputs trivial merge results and conflicting stages to the standard output in a semi\-diff format\&. Since this was designed for higher level scripts to consume and merge the results back into the index, it omits entries that match <branch1>\&. The result of this second form is similar to what three\-way \fIgit read\-tree \-m\fR does, but instead of storing the results in the index, the command outputs the entries to the standard output\&. +.sp +This form not only has limited applicability (a trivial merge cannot handle content merges of individual files, rename detection, proper directory/file conflict handling, etc\&.), the output format is also difficult to work with, and it will generally be less performant than the first form even on successful merges (especially if working in large repositories)\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite diff --git a/man1/git-merge.1 b/man1/git-merge.1 index 4699824c1..8645bc3d5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool--lib.1 b/man1/git-mergetool--lib.1 index 869f057f2..261709749 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGETOOL\-\-LI" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGETOOL\-\-LI" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index b0fbc0ccf..03bbced35 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktag.1 b/man1/git-mktag.1 index 2a75efe45..e12488a57 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MKTAG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MKTAG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mktree.1 b/man1/git-mktree.1 index 7447e7f24..09f1d4280 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MKTREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MKTREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-multi-pack-index.1 b/man1/git-multi-pack-index.1 index 3a5e4ec04..d06d135d4 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MULTI\-PACK\-IN" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MULTI\-PACK\-IN" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mv.1 b/man1/git-mv.1 index 04151ac66..33bbbb459 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-MV" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-MV" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-name-rev.1 b/man1/git-name-rev.1 index 70c15247a..1d9200a02 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-NAME\-REV" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-NAME\-REV" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-notes.1 b/man1/git-notes.1 index 35cfc89f3..f2436486b 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-NOTES" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-NOTES" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-p4.1 b/man1/git-p4.1 index d2c1923f2..7fe9671a6 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-P4" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-P4" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index 5d30b06b2..28fb73f12 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PACK\-OBJECTS" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-redundant.1 b/man1/git-pack-redundant.1 index 44d67d071..6a1ae43b5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PACK\-REDUNDANT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PACK\-REDUNDANT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pack-refs.1 b/man1/git-pack-refs.1 index 17676f462..19f5c5c60 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PACK\-REFS" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PACK\-REFS" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-patch-id.1 b/man1/git-patch-id.1 index 4a1e5bed2..e2cf4dd6a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PATCH\-ID" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PATCH\-ID" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune-packed.1 b/man1/git-prune-packed.1 index a2a46ff78..0f0bcb86a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PRUNE\-PACKED" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PRUNE\-PACKED" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-prune.1 b/man1/git-prune.1 index 1dbd5aaba..f231bae4a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PRUNE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PRUNE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-pull.1 b/man1/git-pull.1 index b3bbb6a19..3a87f45cd 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PULL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PULL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-push.1 b/man1/git-push.1 index c75d36c3b..b7d6acbf2 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-PUSH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-PUSH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-quiltimport.1 b/man1/git-quiltimport.1 index dfc3fd0ef..c9d6cd949 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-QUILTIMPORT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-QUILTIMPORT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-range-diff.1 b/man1/git-range-diff.1 index 9e0ff698b..58603b3b7 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-RANGE\-DIFF" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-RANGE\-DIFF" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-read-tree.1 b/man1/git-read-tree.1 index d35e57f63..97873e977 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-READ\-TREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-READ\-TREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 8d567d9e9..b8ac4348b 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REBASE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REBASE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -41,17 +41,17 @@ git-rebase \- Reapply commits on top of another base tip .sp .SH "DESCRIPTION" .sp -If <branch> is specified, \fIgit rebase\fR will perform an automatic \fBgit switch <branch>\fR before doing anything else\&. Otherwise it remains on the current branch\&. +If \fB<branch>\fR is specified, \fBgit rebase\fR will perform an automatic \fBgit switch <branch>\fR before doing anything else\&. Otherwise it remains on the current branch\&. .sp -If <upstream> is not specified, the upstream configured in branch\&.<name>\&.remote and branch\&.<name>\&.merge options will be used (see \fBgit-config\fR(1) for details) and the \fB\-\-fork\-point\fR option is assumed\&. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort\&. +If \fB<upstream>\fR is not specified, the upstream configured in \fBbranch\&.<name>\&.remote\fR and \fBbranch\&.<name>\&.merge\fR options will be used (see \fBgit-config\fR(1) for details) and the \fB\-\-fork\-point\fR option is assumed\&. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort\&. .sp -All changes made by commits in the current branch but that are not in <upstream> are saved to a temporary area\&. This is the same set of commits that would be shown by \fBgit log <upstream>\&.\&.HEAD\fR; or by \fBgit log \(aqfork_point\(aq\&.\&.HEAD\fR, if \fB\-\-fork\-point\fR is active (see the description on \fB\-\-fork\-point\fR below); or by \fBgit log HEAD\fR, if the \fB\-\-root\fR option is specified\&. +All changes made by commits in the current branch but that are not in \fB<upstream>\fR are saved to a temporary area\&. This is the same set of commits that would be shown by \fBgit log <upstream>\&.\&.HEAD\fR; or by \fBgit log \(aqfork_point\(aq\&.\&.HEAD\fR, if \fB\-\-fork\-point\fR is active (see the description on \fB\-\-fork\-point\fR below); or by \fBgit log HEAD\fR, if the \fB\-\-root\fR option is specified\&. .sp -The current branch is reset to <upstream>, or <newbase> if the \-\-onto option was supplied\&. This has the exact same effect as \fBgit reset \-\-hard <upstream>\fR (or <newbase>)\&. ORIG_HEAD is set to point at the tip of the branch before the reset\&. +The current branch is reset to \fB<upstream>\fR or \fB<newbase>\fR if the \fB\-\-onto\fR option was supplied\&. This has the exact same effect as \fBgit reset \-\-hard <upstream>\fR (or \fB<newbase>\fR)\&. \fBORIG_HEAD\fR is set to point at the tip of the branch before the reset\&. .sp -The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order\&. Note that any commits in HEAD which introduce the same textual changes as a commit in HEAD\&.\&.<upstream> are omitted (i\&.e\&., a patch already accepted upstream with a different commit message or timestamp will be skipped)\&. +The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order\&. Note that any commits in \fBHEAD\fR which introduce the same textual changes as a commit in \fBHEAD\&.\&.<upstream>\fR are omitted (i\&.e\&., a patch already accepted upstream with a different commit message or timestamp will be skipped)\&. .sp -It is possible that a merge failure will prevent this process from being completely automatic\&. You will have to resolve any such merge failure and run \fBgit rebase \-\-continue\fR\&. Another option is to bypass the commit that caused the merge failure with \fBgit rebase \-\-skip\fR\&. To check out the original <branch> and remove the \&.git/rebase\-apply working files, use the command \fBgit rebase \-\-abort\fR instead\&. +It is possible that a merge failure will prevent this process from being completely automatic\&. You will have to resolve any such merge failure and run \fBgit rebase \-\-continue\fR\&. Another option is to bypass the commit that caused the merge failure with \fBgit rebase \-\-skip\fR\&. To check out the original \fB<branch>\fR and remove the \fB\&.git/rebase\-apply\fR working files, use the command \fBgit rebase \-\-abort\fR instead\&. .sp Assume the following history exists and the current branch is "topic": .sp @@ -98,7 +98,7 @@ would be: .sp \fBNOTE:\fR The latter form is just a short\-hand of \fBgit checkout topic\fR followed by \fBgit rebase master\fR\&. When rebase exits \fBtopic\fR will remain the checked\-out branch\&. .sp -If the upstream branch already contains a change you have made (e\&.g\&., because you mailed a patch which was applied upstream), then that commit will be skipped and warnings will be issued (if the \fBmerge\fR backend is used)\&. For example, running \fBgit rebase master\fR on the following history (in which \fBA\(aq\fR and \fBA\fR introduce the same set of changes, but have different committer information): +If the upstream branch already contains a change you have made (e\&.g\&., because you mailed a patch which was applied upstream), then that commit will be skipped and warnings will be issued (if the \fImerge\fR backend is used)\&. For example, running \fBgit rebase master\fR on the following history (in which \fBA\(aq\fR and \fBA\fR introduce the same set of changes, but have different committer information): .sp .if n \{\ .RS 4 @@ -262,9 +262,9 @@ would result in the removal of commits F and G: .\} .sp .sp -This is useful if F and G were flawed in some way, or should not be part of topicA\&. Note that the argument to \-\-onto and the <upstream> parameter can be any valid commit\-ish\&. +This is useful if F and G were flawed in some way, or should not be part of topicA\&. Note that the argument to \fB\-\-onto\fR and the \fB<upstream>\fR parameter can be any valid commit\-ish\&. .sp -In case of conflict, \fIgit rebase\fR will stop at the first problematic commit and leave conflict markers in the tree\&. You can use \fIgit diff\fR to locate the markers (<<<<<<) and make edits to resolve the conflict\&. For each file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with +In case of conflict, \fBgit rebase\fR will stop at the first problematic commit and leave conflict markers in the tree\&. You can use \fBgit diff\fR to locate the markers (<<<<<<) and make edits to resolve the conflict\&. For each file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with .sp .if n \{\ .RS 4 @@ -303,23 +303,36 @@ git rebase \-\-abort .PP \-\-onto <newbase> .RS 4 -Starting point at which to create the new commits\&. If the \-\-onto option is not specified, the starting point is <upstream>\&. May be any valid commit, and not just an existing branch name\&. +Starting point at which to create the new commits\&. If the +\fB\-\-onto\fR +option is not specified, the starting point is +\fB<upstream>\fR\&. May be any valid commit, and not just an existing branch name\&. .sp As a special case, you may use "A\&.\&.\&.B" as a shortcut for the merge base of A and B if there is exactly one merge base\&. You can leave out at most one of A and B, in which case it defaults to HEAD\&. .RE .PP \-\-keep\-base .RS 4 -Set the starting point at which to create the new commits to the merge base of <upstream> and <branch>\&. Running -\fIgit rebase \-\-keep\-base <upstream> <branch>\fR +Set the starting point at which to create the new commits to the merge base of +\fB<upstream>\fR +and +\fB<branch>\fR\&. Running +\fBgit rebase \-\-keep\-base <upstream> <branch>\fR is equivalent to running -\fIgit rebase \-\-onto <upstream>\&...<branch> <upstream> <branch>\fR\&. +\fBgit rebase \-\-onto <upstream>\&.\&.\&.<branch> <upstream> <branch>\fR\&. .sp This option is useful in the case where one is developing a feature on top of an upstream branch\&. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as\-is\&. .sp -Although both this option and \-\-fork\-point find the merge base between <upstream> and <branch>, this option uses the merge base as the +Although both this option and +\fB\-\-fork\-point\fR +find the merge base between +\fB<upstream>\fR +and +\fB<branch>\fR, this option uses the merge base as the \fIstarting point\fR -on which new commits will be created, whereas \-\-fork\-point uses the merge base to determine the +on which new commits will be created, whereas +\fB\-\-fork\-point\fR +uses the merge base to determine the \fIset of commits\fR which will be rebased\&. .sp @@ -333,7 +346,8 @@ Upstream branch to compare against\&. May be any valid commit, not just an exist .PP <branch> .RS 4 -Working branch; defaults to HEAD\&. +Working branch; defaults to +\fBHEAD\fR\&. .RE .PP \-\-continue @@ -343,12 +357,22 @@ Restart the rebasing process after having resolved a merge conflict\&. .PP \-\-abort .RS 4 -Abort the rebase operation and reset HEAD to the original branch\&. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>\&. Otherwise HEAD will be reset to where it was when the rebase operation was started\&. +Abort the rebase operation and reset HEAD to the original branch\&. If +\fB<branch>\fR +was provided when the rebase operation was started, then +\fBHEAD\fR +will be reset to +\fB<branch>\fR\&. Otherwise +\fBHEAD\fR +will be reset to where it was when the rebase operation was started\&. .RE .PP \-\-quit .RS 4 -Abort the rebase operation but HEAD is not reset back to the original branch\&. The index and working tree are also left unchanged as a result\&. If a temporary stash entry was created using \-\-autostash, it will be saved to the stash list\&. +Abort the rebase operation but +\fBHEAD\fR +is not reset back to the original branch\&. The index and working tree are also left unchanged as a result\&. If a temporary stash entry was created using +\fB\-\-autostash\fR, it will be saved to the stash list\&. .RE .PP \-\-apply @@ -362,22 +386,34 @@ See also INCOMPATIBLE OPTIONS below\&. .PP \-\-empty={drop,keep,ask} .RS 4 -How to handle commits that are not empty to start and are not clean cherry\-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes)\&. With drop (the default), commits that become empty are dropped\&. With keep, such commits are kept\&. With ask (implied by \-\-interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes\&. Other options, like \-\-exec, will use the default of drop unless \-i/\-\-interactive is explicitly specified\&. +How to handle commits that are not empty to start and are not clean cherry\-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes)\&. With drop (the default), commits that become empty are dropped\&. With keep, such commits are kept\&. With ask (implied by +\fB\-\-interactive\fR), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes\&. Other options, like +\fB\-\-exec\fR, will use the default of drop unless +\fB\-i\fR/\fB\-\-interactive\fR +is explicitly specified\&. .sp -Note that commits which start empty are kept (unless \-\-no\-keep\-empty is specified), and commits which are clean cherry\-picks (as determined by -\fBgit log \-\-cherry\-mark \&.\&.\&.\fR) are detected and dropped as a preliminary step (unless \-\-reapply\-cherry\-picks is passed)\&. +Note that commits which start empty are kept (unless +\fB\-\-no\-keep\-empty\fR +is specified), and commits which are clean cherry\-picks (as determined by +\fBgit log \-\-cherry\-mark \&.\&.\&.\fR) are detected and dropped as a preliminary step (unless +\fB\-\-reapply\-cherry\-picks\fR +is passed)\&. .sp See also INCOMPATIBLE OPTIONS below\&. .RE .PP \-\-no\-keep\-empty, \-\-keep\-empty .RS 4 -Do not keep commits that start empty before the rebase (i\&.e\&. that do not change anything from its parent) in the result\&. The default is to keep commits which start empty, since creating such commits requires passing the \-\-allow\-empty override flag to +Do not keep commits that start empty before the rebase (i\&.e\&. that do not change anything from its parent) in the result\&. The default is to keep commits which start empty, since creating such commits requires passing the +\fB\-\-allow\-empty\fR +override flag to \fBgit commit\fR, signifying that a user is very intentionally creating such a commit and thus wants to keep it\&. .sp Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don\(cqt want\&. This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed\&. .sp -For commits which do not start empty but become empty after rebasing, see the \-\-empty flag\&. +For commits which do not start empty but become empty after rebasing, see the +\fB\-\-empty\fR +flag\&. .sp See also INCOMPATIBLE OPTIONS below\&. .RE @@ -391,7 +427,7 @@ flag\&.) By default (or if \fB\-\-no\-reapply\-cherry\-picks\fR is given), these commits will be automatically dropped\&. Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read\&. When using the -\fBmerge\fR +\fImerge\fR backend, warnings will be issued for each dropped commit (unless \fB\-\-quiet\fR is given)\&. Advice will also be issued unless @@ -432,9 +468,12 @@ Show the current patch in an interactive rebase or when rebase is stopped becaus .RS 4 Using merging strategies to rebase (default)\&. .sp -Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch\&. Because of this, when a merge conflict happens, the side reported as +Note that a rebase merge works by replaying each commit from the working branch on top of the +\fB<upstream>\fR +branch\&. Because of this, when a merge conflict happens, the side reported as \fIours\fR -is the so\-far rebased series, starting with <upstream>, and +is the so\-far rebased series, starting with +\fB<upstream>\fR, and \fItheirs\fR is the working branch\&. In other words, the sides are swapped\&. .sp @@ -448,10 +487,13 @@ Use the given merge strategy, instead of the default \fB\-\-merge\fR\&. .sp Because -\fIgit rebase\fR -replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the -\fIours\fR -strategy simply empties all patches from the <branch>, which makes little sense\&. +\fBgit rebase\fR +replays each commit from the working branch on top of the +\fB<upstream>\fR +branch using the given strategy, using the +\fBours\fR +strategy simply empties all patches from the +\fB<branch>\fR, which makes little sense\&. .sp See also INCOMPATIBLE OPTIONS below\&. .RE @@ -491,12 +533,14 @@ configuration variable, and earlier .PP \-q, \-\-quiet .RS 4 -Be quiet\&. Implies \-\-no\-stat\&. +Be quiet\&. Implies +\fB\-\-no\-stat\fR\&. .RE .PP \-v, \-\-verbose .RS 4 -Be verbose\&. Implies \-\-stat\&. +Be verbose\&. Implies +\fB\-\-stat\fR\&. .RE .PP \-\-stat @@ -517,13 +561,17 @@ This option bypasses the pre\-rebase hook\&. See also .PP \-\-verify .RS 4 -Allows the pre\-rebase hook to run, which is the default\&. This option can be used to override \-\-no\-verify\&. See also +Allows the pre\-rebase hook to run, which is the default\&. This option can be used to override +\fB\-\-no\-verify\fR\&. See also \fBgithooks\fR(5)\&. .RE .PP \-C<n> .RS 4 -Ensure at least <n> lines of surrounding context match before and after each change\&. When fewer lines of surrounding context exist they all must match\&. By default no context is ever ignored\&. Implies \-\-apply\&. +Ensure at least +\fB<n>\fR +lines of surrounding context match before and after each change\&. When fewer lines of surrounding context exist they all must match\&. By default no context is ever ignored\&. Implies +\fB\-\-apply\fR\&. .sp See also INCOMPATIBLE OPTIONS below\&. .RE @@ -539,27 +587,44 @@ for details)\&. .PP \-\-fork\-point, \-\-no\-fork\-point .RS 4 -Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>\&. +Use reflog to find a better common ancestor between +\fB<upstream>\fR +and +\fB<branch>\fR +when calculating which commits have been introduced by +\fB<branch>\fR\&. .sp -When \-\-fork\-point is active, +When +\fB\-\-fork\-point\fR +is active, \fIfork_point\fR -will be used instead of <upstream> to calculate the set of commits to rebase, where +will be used instead of +\fB<upstream>\fR +to calculate the set of commits to rebase, where \fIfork_point\fR is the result of \fBgit merge\-base \-\-fork\-point <upstream> <branch>\fR command (see \fBgit-merge-base\fR(1))\&. If \fIfork_point\fR -ends up being empty, the <upstream> will be used as a fallback\&. +ends up being empty, the +\fB<upstream>\fR +will be used as a fallback\&. .sp -If <upstream> is given on the command line, then the default is +If +\fB<upstream>\fR +is given on the command line, then the default is \fB\-\-no\-fork\-point\fR, otherwise the default is \fB\-\-fork\-point\fR\&. See also \fBrebase\&.forkpoint\fR in \fBgit-config\fR(1)\&. .sp -If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with +If your branch was based on +\fB<upstream>\fR +but +\fB<upstream>\fR +was rewound and your branch contains commits which were dropped, this option can be used with \fB\-\-keep\-base\fR in order to drop those commits from your branch\&. .sp @@ -569,18 +634,25 @@ See also INCOMPATIBLE OPTIONS below\&. \-\-ignore\-whitespace .RS 4 Ignore whitespace differences when trying to reconcile differences\&. Currently, each backend implements an approximation of this behavior: -.sp -apply backend: When applying a patch, ignore changes in whitespace in context lines\&. Unfortunately, this means that if the "old" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application\&. -.sp -merge backend: Treat lines with only whitespace changes as unchanged when merging\&. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted\&. +.PP +apply backend +.RS 4 +When applying a patch, ignore changes in whitespace in context lines\&. Unfortunately, this means that if the "old" lines being replaced by the patch differ only in whitespace from the existing file, you will get a merge conflict instead of a successful patch application\&. +.RE +.PP +merge backend +.RS 4 +Treat lines with only whitespace changes as unchanged when merging\&. Unfortunately, this means that any patch hunks that were intended to modify whitespace and nothing else will be dropped, even if the other side had no changes that conflicted\&. +.RE .RE .PP \-\-whitespace=<option> .RS 4 This flag is passed to the -\fIgit apply\fR +\fBgit apply\fR program (see -\fBgit-apply\fR(1)) that applies the patch\&. Implies \-\-apply\&. +\fBgit-apply\fR(1)) that applies the patch\&. Implies +\fB\-\-apply\fR\&. .sp See also INCOMPATIBLE OPTIONS below\&. .RE @@ -649,7 +721,9 @@ See also REBASING MERGES and INCOMPATIBLE OPTIONS below\&. .PP \-x <cmd>, \-\-exec <cmd> .RS 4 -Append "exec <cmd>" after each line creating a commit in the final history\&. <cmd> will be interpreted as one or more shell commands\&. Any command that fails will interrupt the rebase, with exit code 1\&. +Append "exec <cmd>" after each line creating a commit in the final history\&. +\fB<cmd>\fR +will be interpreted as one or more shell commands\&. Any command that fails will interrupt the rebase, with exit code 1\&. .sp You may execute several commands by either using one instance of \fB\-\-exec\fR @@ -680,7 +754,9 @@ git rebase \-i \-\-exec "cmd1" \-\-exec "cmd2" \-\-exec \&.\&.\&. .sp If \fB\-\-autosquash\fR -is used, "exec" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series\&. +is used, +\fBexec\fR +lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series\&. .sp This uses the \fB\-\-interactive\fR @@ -692,7 +768,15 @@ See also INCOMPATIBLE OPTIONS below\&. .PP \-\-root .RS 4 -Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>\&. This allows you to rebase the root commit(s) on a branch\&. When used with \-\-onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without \-\-onto it will operate on every change\&. +Rebase all commits reachable from +\fB<branch>\fR, instead of limiting them with an +\fB<upstream>\fR\&. This allows you to rebase the root commit(s) on a branch\&. When used with +\fB\-\-onto\fR, it will skip changes already contained in +\fB<newbase>\fR +(instead of +\fB<upstream>\fR) whereas without +\fB\-\-onto\fR +it will operate on every change\&. .sp See also INCOMPATIBLE OPTIONS below\&. .RE @@ -972,38 +1056,38 @@ In addition, the following pairs of options are incompatible: .RE .SH "BEHAVIORAL DIFFERENCES" .sp -git rebase has two primary backends: apply and merge\&. (The apply backend used to be known as the \fIam\fR backend, but the name led to confusion as it looks like a verb instead of a noun\&. Also, the merge backend used to be known as the interactive backend, but it is now used for non\-interactive cases as well\&. Both were renamed based on lower\-level functionality that underpinned each\&.) There are some subtle differences in how these two backends behave: +\fBgit rebase\fR has two primary backends: \fIapply\fR and \fImerge\fR\&. (The \fIapply\fR backend used to be known as the \fIam\fR backend, but the name led to confusion as it looks like a verb instead of a noun\&. Also, the \fImerge\fR backend used to be known as the interactive backend, but it is now used for non\-interactive cases as well\&. Both were renamed based on lower\-level functionality that underpinned each\&.) There are some subtle differences in how these two backends behave: .SS "Empty commits" .sp -The apply backend unfortunately drops intentionally empty commits, i\&.e\&. commits that started empty, though these are rare in practice\&. It also drops commits that become empty and has no option for controlling this behavior\&. +The \fIapply\fR backend unfortunately drops intentionally empty commits, i\&.e\&. commits that started empty, though these are rare in practice\&. It also drops commits that become empty and has no option for controlling this behavior\&. .sp -The merge backend keeps intentionally empty commits by default (though with \-i they are marked as empty in the todo list editor, or they can be dropped automatically with \-\-no\-keep\-empty)\&. +The \fImerge\fR backend keeps intentionally empty commits by default (though with \fB\-i\fR they are marked as empty in the todo list editor, or they can be dropped automatically with \fB\-\-no\-keep\-empty\fR)\&. .sp -Similar to the apply backend, by default the merge backend drops commits that become empty unless \-i/\-\-interactive is specified (in which case it stops and asks the user what to do)\&. The merge backend also has an \-\-empty={drop,keep,ask} option for changing the behavior of handling commits that become empty\&. +Similar to the apply backend, by default the merge backend drops commits that become empty unless \fB\-i\fR/\fB\-\-interactive\fR is specified (in which case it stops and asks the user what to do)\&. The merge backend also has an \fB\-\-empty={drop,keep,ask}\fR option for changing the behavior of handling commits that become empty\&. .SS "Directory rename detection" .sp -Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the apply backend\&. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory\&. +Due to the lack of accurate tree information (arising from constructing fake ancestors with the limited information available in patches), directory rename detection is disabled in the \fIapply\fR backend\&. Disabled directory rename detection means that if one side of history renames a directory and the other adds new files to the old directory, then the new files will be left behind in the old directory without any warning at the time of rebasing that you may want to move these files into the new directory\&. .sp -Directory rename detection works with the merge backend to provide you warnings in such cases\&. +Directory rename detection works with the \fImerge\fR backend to provide you warnings in such cases\&. .SS "Context" .sp -The apply backend works by creating a sequence of patches (by calling \fBformat\-patch\fR internally), and then applying the patches in sequence (calling \fBam\fR internally)\&. Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes\&. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file\&. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines\&. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked\&. There are real\-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported\&. Setting diff\&.context to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)\&. +The \fIapply\fR backend works by creating a sequence of patches (by calling \fBformat\-patch\fR internally), and then applying the patches in sequence (calling \fBam\fR internally)\&. Patches are composed of multiple hunks, each with line numbers, a context region, and the actual changes\&. The line numbers have to be taken with some fuzz, since the other side will likely have inserted or deleted lines earlier in the file\&. The context region is meant to help find how to adjust the line numbers in order to apply the changes to the right lines\&. However, if multiple areas of the code have the same surrounding lines of context, the wrong one can be picked\&. There are real\-world cases where this has caused commits to be reapplied incorrectly with no conflicts reported\&. Setting \fBdiff\&.context\fR to a larger value may prevent such types of problems, but increases the chance of spurious conflicts (since it will require more lines of matching context to apply)\&. .sp -The merge backend works with a full copy of each relevant file, insulating it from these types of problems\&. +The \fImerge\fR backend works with a full copy of each relevant file, insulating it from these types of problems\&. .SS "Labelling of conflicts markers" .sp -When there are content conflicts, the merge machinery tries to annotate each side\(cqs conflict markers with the commits where the content came from\&. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary\&. Also, when merge\&.conflictStyle is set to diff3 or zdiff3, the apply backend will use "constructed merge base" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever\&. +When there are content conflicts, the merge machinery tries to annotate each side\(cqs conflict markers with the commits where the content came from\&. Since the \fIapply\fR backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary\&. Also, when \fBmerge\&.conflictStyle\fR is set to \fBdiff3\fR or \fBzdiff3\fR, the \fIapply\fR backend will use "constructed merge base" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever\&. .sp -The merge backend works with the full commits on both sides of history and thus has no such limitations\&. +The \fImerge\fR backend works with the full commits on both sides of history and thus has no such limitations\&. .SS "Hooks" .sp -The apply backend has not traditionally called the post\-commit hook, while the merge backend has\&. Both have called the post\-checkout hook, though the merge backend has squelched its output\&. Further, both backends only call the post\-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit\&. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like \fIgit checkout\fR or \fIgit commit\fR that would call the hooks)\&. Both backends should have the same behavior, though it is not entirely clear which, if any, is correct\&. We will likely make rebase stop calling either of these hooks in the future\&. +The \fIapply\fR backend has not traditionally called the post\-commit hook, while the \fImerge\fR backend has\&. Both have called the post\-checkout hook, though the \fImerge\fR backend has squelched its output\&. Further, both backends only call the post\-checkout hook with the starting point commit of the rebase, not the intermediate commits nor the final commit\&. In each case, the calling of these hooks was by accident of implementation rather than by design (both backends were originally implemented as shell scripts and happened to invoke other commands like \fBgit checkout\fR or \fBgit commit\fR that would call the hooks)\&. Both backends should have the same behavior, though it is not entirely clear which, if any, is correct\&. We will likely make rebase stop calling either of these hooks in the future\&. .SS "Interruptability" .sp -The apply backend has safety problems with an ill\-timed interrupt; if the user presses Ctrl\-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent \fBgit rebase \-\-abort\fR\&. The merge backend does not appear to suffer from the same shortcoming\&. (See \m[blue]\fBhttps://lore\&.kernel\&.org/git/20200207132152\&.GC2868@szeder\&.dev/\fR\m[] for details\&.) +The \fIapply\fR backend has safety problems with an ill\-timed interrupt; if the user presses Ctrl\-C at the wrong time to try to abort the rebase, the rebase can enter a state where it cannot be aborted with a subsequent \fBgit rebase \-\-abort\fR\&. The \fImerge\fR backend does not appear to suffer from the same shortcoming\&. (See \m[blue]\fBhttps://lore\&.kernel\&.org/git/20200207132152\&.GC2868@szeder\&.dev/\fR\m[] for details\&.) .SS "Commit Rewording" .sp -When a conflict occurs while rebasing, rebase stops and asks the user to resolve\&. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run \fBgit rebase \-\-continue\fR, the rebase should open an editor and ask the user to update the commit message\&. The merge backend does this, while the apply backend blindly applies the original commit message\&. +When a conflict occurs while rebasing, rebase stops and asks the user to resolve\&. Since the user may need to make notable changes while resolving conflicts, after conflicts are resolved and the user has run \fBgit rebase \-\-continue\fR, the rebase should open an editor and ask the user to update the commit message\&. The \fImerge\fR backend does this, while the \fIapply\fR backend blindly applies the original commit message\&. .SS "Miscellaneous differences" .sp There are a few more behavioral differences that most folks would probably consider inconsequential but which are mentioned for completeness: @@ -1038,7 +1122,8 @@ Progress, informational, and error messages: The two backends provide slightly d .sp -1 .IP \(bu 2.3 .\} -State directories: The two backends keep their state in different directories under \&.git/ +State directories: The two backends keep their state in different directories under +\fB\&.git/\fR .RE .SH "MERGE STRATEGIES" .sp @@ -1237,11 +1322,11 @@ strategy\&. When merging trees A and B, if B corresponds to a subtree of A, B is With the strategies that use 3\-way merge (including the default, \fIort\fR), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing\&. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits\&. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead\&. .SH "NOTES" .sp -You should understand the implications of using \fIgit rebase\fR on a repository that you share\&. See also RECOVERING FROM UPSTREAM REBASE below\&. +You should understand the implications of using \fBgit rebase\fR on a repository that you share\&. See also RECOVERING FROM UPSTREAM REBASE below\&. .sp -When the git\-rebase command is run, it will first execute a "pre\-rebase" hook if one exists\&. You can use this hook to do sanity checks and reject the rebase if it isn\(cqt appropriate\&. Please see the template pre\-rebase hook script for an example\&. +When the rebase is run, it will first execute a \fBpre\-rebase\fR hook if one exists\&. You can use this hook to do sanity checks and reject the rebase if it isn\(cqt appropriate\&. Please see the template \fBpre\-rebase\fR hook script for an example\&. .sp -Upon completion, <branch> will be the current branch\&. +Upon completion, \fB<branch>\fR will be the current branch\&. .SH "INTERACTIVE MODE" .sp Rebasing interactively means that you have a chance to edit the commits which are rebased\&. You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)\&. @@ -1384,7 +1469,7 @@ pick fa1afe1 The oneline of the next commit .sp The oneline descriptions are purely for your pleasure; \fIgit rebase\fR will not look at them but at the commit names ("deadbee" and "fa1afe1" in this example), so do not delete or edit the names\&. .sp -By replacing the command "pick" with the command "edit", you can tell \fIgit rebase\fR to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing\&. +By replacing the command "pick" with the command "edit", you can tell \fBgit rebase\fR to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing\&. .sp To interrupt the rebase (just like an "edit" command would do, but without cherry\-picking any commit first), use the "break" command\&. .sp @@ -1394,9 +1479,9 @@ To drop a commit, replace the command "pick" with "drop", or just delete the mat .sp If you want to fold two or more commits into one, replace the command "pick" for the second and subsequent commits with "squash" or "fixup"\&. If the commits had different authors, the folded commit will be attributed to the author of the first commit\&. The suggested commit message for the folded commit is the concatenation of the first commit\(cqs message with those identified by "squash" commands, omitting the messages of commits identified by "fixup" commands, unless "fixup \-c" is used\&. In that case the suggested commit message is only the message of the "fixup \-c" commit, and an editor is opened allowing you to edit the message\&. The contents (patch) of the "fixup \-c" commit are still incorporated into the folded commit\&. If there is more than one "fixup \-c" commit, the message from the final one is used\&. You can also use "fixup \-C" to get the same behavior as "fixup \-c" except without opening an editor\&. .sp -\fIgit rebase\fR will stop when "pick" has been replaced with "edit" or when a command fails due to merge errors\&. When you are done editing and/or resolving conflicts you can continue with \fBgit rebase \-\-continue\fR\&. +\fBgit rebase\fR will stop when "pick" has been replaced with "edit" or when a command fails due to merge errors\&. When you are done editing and/or resolving conflicts you can continue with \fBgit rebase \-\-continue\fR\&. .sp -For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD\&. To achieve that, you would call \fIgit rebase\fR like this: +For example, if you want to reorder the last 5 commits, such that what was \fBHEAD~4\fR becomes the new \fBHEAD\fR\&. To achieve that, you would call \fBgit rebase\fR like this: .sp .if n \{\ .RS 4 @@ -1428,7 +1513,7 @@ You might want to recreate merge commits, e\&.g\&. if you have a history like th .\} .sp .sp -Suppose you want to rebase the side branch starting at "A" to "Q"\&. Make sure that the current HEAD is "B", and call +Suppose you want to rebase the side branch starting at "A" to "Q"\&. Make sure that the current \fBHEAD\fR is "B", and call .sp .if n \{\ .RS 4 @@ -1496,7 +1581,7 @@ exec make test .sp .SH "SPLITTING COMMITS" .sp -In interactive mode, you can mark commits with the action "edit"\&. However, this does not necessarily mean that \fIgit rebase\fR expects the result of this edit to be exactly one commit\&. Indeed, you can undo the commit, or you can add other commits\&. This can be used to split a commit into two: +In interactive mode, you can mark commits with the action "edit"\&. However, this does not necessarily mean that \fBgit rebase\fR expects the result of this edit to be exactly one commit\&. Indeed, you can undo the commit, or you can add other commits\&. This can be used to split a commit into two: .sp .RS 4 .ie n \{\ @@ -1507,7 +1592,9 @@ In interactive mode, you can mark commits with the action "edit"\&. However, thi .IP \(bu 2.3 .\} Start an interactive rebase with -\fBgit rebase \-i <commit>^\fR, where <commit> is the commit you want to split\&. In fact, any commit range will do, as long as it contains that commit\&. +\fBgit rebase \-i <commit>^\fR, where +\fB<commit>\fR +is the commit you want to split\&. In fact, any commit range will do, as long as it contains that commit\&. .RE .sp .RS 4 @@ -1530,7 +1617,9 @@ Mark the commit you want to split with the action "edit"\&. .IP \(bu 2.3 .\} When it comes to editing that commit, execute -\fBgit reset HEAD^\fR\&. The effect is that the HEAD is rewound by one, and the index follows suit\&. However, the working tree stays the same\&. +\fBgit reset HEAD^\fR\&. The effect is that the +\fBHEAD\fR +is rewound by one, and the index follows suit\&. However, the working tree stays the same\&. .RE .sp .RS 4 @@ -1544,7 +1633,7 @@ When it comes to editing that commit, execute Now add the changes to the index that you want to have in the first commit\&. You can use \fBgit add\fR (possibly interactively) or -\fIgit gui\fR +\fBgit gui\fR (or both) to do that\&. .RE .sp @@ -1582,7 +1671,7 @@ Continue the rebase with \fBgit rebase \-\-continue\fR\&. .RE .sp -If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc\&.) you should use \fIgit stash\fR to stash away the not\-yet\-committed changes after each commit, test, and amend the commit if fixes are necessary\&. +If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc\&.) you should use \fBgit stash\fR to stash away the not\-yet\-committed changes after each commit, test, and amend the commit if fixes are necessary\&. .SH "RECOVERING FROM UPSTREAM REBASE" .sp Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history\&. This section explains how to do the fix from the downstream\(cqs point of view\&. The real fix, however, would be to avoid rebasing the upstream in the first place\&. @@ -1713,7 +1802,7 @@ While an "easy case recovery" sometimes appears to be successful even in the har .sp .5v .RE .sp -The idea is to manually tell \fIgit rebase\fR "where the old \fIsubsystem\fR ended and your \fItopic\fR began", that is, what the old merge base between them was\&. You will have to find a way to name the last commit of the old \fIsubsystem\fR, for example: +The idea is to manually tell \fBgit rebase\fR "where the old \fIsubsystem\fR ended and your \fItopic\fR began", that is, what the old merge base between them was\&. You will have to find a way to name the last commit of the old \fIsubsystem\fR, for example: .sp .RS 4 .ie n \{\ @@ -1726,7 +1815,7 @@ The idea is to manually tell \fIgit rebase\fR "where the old \fIsubsystem\fR end With the \fIsubsystem\fR reflog: after -\fIgit fetch\fR, the old tip of +\fBgit fetch\fR, the old tip of \fIsubsystem\fR is at \fBsubsystem@{1}\fR\&. Subsequent fetches will increase the number\&. (See diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index f22cace54..6e5863d93 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-RECEIVE\-PACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-RECEIVE\-PACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reflog.1 b/man1/git-reflog.1 index 4f698a009..971071d7a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REFLOG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REFLOG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-ext.1 b/man1/git-remote-ext.1 index b376df759..a20adaffc 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REMOTE\-EXT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REMOTE\-EXT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote-fd.1 b/man1/git-remote-fd.1 index e059df3d1..59e94f017 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REMOTE\-FD" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REMOTE\-FD" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-remote.1 b/man1/git-remote.1 index 289990d10..0352122fe 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REMOTE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REMOTE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-repack.1 b/man1/git-repack.1 index 954c90342..eef33c095 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REPACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REPACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-replace.1 b/man1/git-replace.1 index 0145a7dac..d67a5c51a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REPLACE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REPLACE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-request-pull.1 b/man1/git-request-pull.1 index c5750f874..e4eca9b88 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REQUEST\-PULL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REQUEST\-PULL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rerere.1 b/man1/git-rerere.1 index bc068d4d4..316968e46 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-RERERE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-RERERE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-reset.1 b/man1/git-reset.1 index 30646b863..9ec728195 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-RESET" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-RESET" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-restore.1 b/man1/git-restore.1 index 9c92f14c3..00298366f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-RESTORE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-RESTORE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index 5fdc2fb4f..4a0169782 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REV\-LIST" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index c46d968bb..298256c68 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REV\-PARSE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REV\-PARSE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -632,13 +632,9 @@ means the <n>th branch/commit checked out before the current one\&. .PP \fI[<branchname>]@{upstream}\fR, e\&.g\&. \fImaster@{upstream}\fR, \fI@{u}\fR .RS 4 -The suffix -\fI@{upstream}\fR -to a branchname (short form -\fI<branchname>@{u}\fR) refers to the branch that the branch specified by branchname is set to build on top of (configured with -\fBbranch\&.<name>\&.remote\fR -and -\fBbranch\&.<name>\&.merge\fR)\&. A missing branchname defaults to the current one\&. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case\&. +A branch B may be set up to build on top of a branch X (configured with +\fBbranch\&.<name>\&.merge\fR) at a remote R (configured with the branch X taken from remote R, typically found at +\fBrefs/remotes/R/X\fR\&. .RE .PP \fI[<branchname>]@{push}\fR, e\&.g\&. \fImaster@{push}\fR, \fI@{push}\fR @@ -651,8 +647,8 @@ were run while \fBbranchname\fR was checked out (or the current \fBHEAD\fR -if no branchname is specified)\&. Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i\&.e\&., something in -\fBrefs/remotes/\fR)\&. +if no branchname is specified)\&. Like for +\fI@{upstream}\fR, we report the remote\-tracking branch that corresponds to that branch at the remote\&. .sp Here\(cqs an example to make it more clear: .sp diff --git a/man1/git-revert.1 b/man1/git-revert.1 index 255a5c942..650acbce8 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-REVERT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-REVERT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-rm.1 b/man1/git-rm.1 index e26ca07ff..8f7653e8e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-RM" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-RM" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 96be43d2c..d4ee884df 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SEND\-EMAIL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-send-pack.1 b/man1/git-send-pack.1 index 6c018e3e6..08e8884f7 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SEND\-PACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SEND\-PACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n--envsubst.1 b/man1/git-sh-i18n--envsubst.1 index eb98305b8..cb9cf992c 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SH\-I18N\-\-ENV" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SH\-I18N\-\-ENV" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-i18n.1 b/man1/git-sh-i18n.1 index 0fb73a628..92a5ed3eb 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SH\-I18N" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SH\-I18N" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sh-setup.1 b/man1/git-sh-setup.1 index 58e05b35f..1f65e27c6 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SH\-SETUP" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SH\-SETUP" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shell.1 b/man1/git-shell.1 index a63bd24e7..9f11c9528 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SHELL" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SHELL" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-shortlog.1 b/man1/git-shortlog.1 index 709b87bcb..38296309f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SHORTLOG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SHORTLOG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-branch.1 b/man1/git-show-branch.1 index 7d8e19cbc..eed104ab6 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SHOW\-BRANCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SHOW\-BRANCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-index.1 b/man1/git-show-index.1 index 4b04a560f..f243fc159 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SHOW\-INDEX" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SHOW\-INDEX" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show-ref.1 b/man1/git-show-ref.1 index 58d2c7fa3..189fa362a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SHOW\-REF" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SHOW\-REF" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-show.1 b/man1/git-show.1 index 41947d7d7..3a70118f7 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SHOW" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SHOW" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-sparse-checkout.1 b/man1/git-sparse-checkout.1 index 18f620d97..a34448469 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SPARSE\-CHECKOU" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SPARSE\-CHECKOU" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stage.1 b/man1/git-stage.1 index d6cf2ba7e..ad186f19f 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-STAGE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-STAGE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stash.1 b/man1/git-stash.1 index e6340ec33..d02853219 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-STASH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-STASH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-status.1 b/man1/git-status.1 index d886d3feb..f9c0d7c91 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-STATUS" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-STATUS" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-stripspace.1 b/man1/git-stripspace.1 index 5f9591703..99a243716 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-STRIPSPACE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-STRIPSPACE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-submodule.1 b/man1/git-submodule.1 index f6c8ad237..ca1affed2 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SUBMODULE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SUBMODULE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 1c93645a0..3cd2872a8 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SVN" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SVN" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-switch.1 b/man1/git-switch.1 index ef9e89498..882c8db6c 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SWITCH" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SWITCH" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-symbolic-ref.1 b/man1/git-symbolic-ref.1 index 9dc8625e8..26389e6bb 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-SYMBOLIC\-REF" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-SYMBOLIC\-REF" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-tag.1 b/man1/git-tag.1 index ecc9c09dd..fe0af4f31 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-TAG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-TAG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-file.1 b/man1/git-unpack-file.1 index ac71d8690..583d719ba 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UNPACK\-FILE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UNPACK\-FILE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-unpack-objects.1 b/man1/git-unpack-objects.1 index 90992bd9f..84dafb874 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UNPACK\-OBJECTS" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UNPACK\-OBJECTS" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 74576f5f5..ddd5e8baf 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-ref.1 b/man1/git-update-ref.1 index 7045105f6..c629c4f92 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UPDATE\-REF" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UPDATE\-REF" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-update-server-info.1 b/man1/git-update-server-info.1 index 45a8cb661..3428f4f83 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UPDATE\-SERVER\" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UPDATE\-SERVER\" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-archive.1 b/man1/git-upload-archive.1 index ce52bd37b..8b71ed529 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UPLOAD\-ARCHIVE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UPLOAD\-ARCHIVE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1 index 997f566d1..f878fd636 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-UPLOAD\-PACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-UPLOAD\-PACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-var.1 b/man1/git-var.1 index ca0506421..3f6d9776d 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-VAR" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-VAR" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-commit.1 b/man1/git-verify-commit.1 index 46b86c06c..ea6105122 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-VERIFY\-COMMIT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-VERIFY\-COMMIT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-pack.1 b/man1/git-verify-pack.1 index b86a24163..880ee93c9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-VERIFY\-PACK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-VERIFY\-PACK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-verify-tag.1 b/man1/git-verify-tag.1 index ec2bbb7c0..433289ac1 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-VERIFY\-TAG" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-VERIFY\-TAG" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-version.1 b/man1/git-version.1 index 8e4988fbe..db021278a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-VERSION" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-VERSION" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-web--browse.1 b/man1/git-web--browse.1 index 3bd07845e..d3ef93791 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-WEB\-\-BROWSE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-WEB\-\-BROWSE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-whatchanged.1 b/man1/git-whatchanged.1 index 7c7cef7ea..eb4c87235 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-WHATCHANGED" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-WHATCHANGED" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-worktree.1 b/man1/git-worktree.1 index b26a6619d..9b54f27d6 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-WORKTREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-WORKTREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-write-tree.1 b/man1/git-write-tree.1 index b4aa66f82..e7d9465ca 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT\-WRITE\-TREE" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT\-WRITE\-TREE" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git.1 b/man1/git.1 index c6feb9884..2ad401983 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GIT" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GIT" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -629,7 +629,7 @@ Instantly browse your working repository in gitweb\&. .PP \fBgit-merge-tree\fR(1) .RS 4 -Show three\-way merge without touching index\&. +Perform merge without touching index or working tree\&. .RE .PP \fBgit-rerere\fR(1) diff --git a/man1/gitk.1 b/man1/gitk.1 index c193826e1..f59f377fd 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITK" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITK" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/gitweb.1 b/man1/gitweb.1 index 1624d06d3..7378f5364 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITWEB" "1" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITWEB" "1" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitattributes.5 b/man5/gitattributes.5 index ac8bcbede..4f3653c0e 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITATTRIBUTES" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITATTRIBUTES" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/githooks.5 b/man5/githooks.5 index 54b953f17..a229c3f80 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITHOOKS" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITHOOKS" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitignore.5 b/man5/gitignore.5 index dd143f98c..d834650eb 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITIGNORE" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITIGNORE" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmailmap.5 b/man5/gitmailmap.5 index cd149980d..ff8d727d5 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITMAILMAP" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITMAILMAP" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitmodules.5 b/man5/gitmodules.5 index f26212128..436834585 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITMODULES" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITMODULES" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitrepository-layout.5 b/man5/gitrepository-layout.5 index d9c8982f6..4d0c7f10a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITREPOSITORY\-LAYOU" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITREPOSITORY\-LAYOU" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man5/gitweb.conf.5 b/man5/gitweb.conf.5 index 5b005ebb4..dc7a8ee94 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITWEB\&.CONF" "5" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITWEB\&.CONF" "5" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcli.7 b/man7/gitcli.7 index 43c033d35..ff384e1f4 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITCLI" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITCLI" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcore-tutorial.7 b/man7/gitcore-tutorial.7 index e75cbb005..c50d6ece9 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITCORE\-TUTORIAL" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITCORE\-TUTORIAL" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcredentials.7 b/man7/gitcredentials.7 index c59a84d98..fdb00910d 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITCREDENTIALS" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITCREDENTIALS" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitcvs-migration.7 b/man7/gitcvs-migration.7 index 78e57f253..616deaf18 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITCVS\-MIGRATION" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITCVS\-MIGRATION" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitdiffcore.7 b/man7/gitdiffcore.7 index 2c3739bf4..0993e8ee2 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITDIFFCORE" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITDIFFCORE" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/giteveryday.7 b/man7/giteveryday.7 index 94642f710..74872daff 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITEVERYDAY" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITEVERYDAY" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitfaq.7 b/man7/gitfaq.7 index 190b7731d..50f9a5624 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITFAQ" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITFAQ" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitglossary.7 b/man7/gitglossary.7 index 87b5ec646..f805f563b 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITGLOSSARY" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITGLOSSARY" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitnamespaces.7 b/man7/gitnamespaces.7 index 6bdb4c11b..710d9d65a 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITNAMESPACES" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITNAMESPACES" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitremote-helpers.7 b/man7/gitremote-helpers.7 index 53a70f4d8..d5244054b 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITREMOTE\-HELPERS" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITREMOTE\-HELPERS" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitrevisions.7 b/man7/gitrevisions.7 index 078b3cf4f..345fb015d 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITREVISIONS" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITREVISIONS" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -257,13 +257,9 @@ means the <n>th branch/commit checked out before the current one\&. .PP \fI[<branchname>]@{upstream}\fR, e\&.g\&. \fImaster@{upstream}\fR, \fI@{u}\fR .RS 4 -The suffix -\fI@{upstream}\fR -to a branchname (short form -\fI<branchname>@{u}\fR) refers to the branch that the branch specified by branchname is set to build on top of (configured with -\fBbranch\&.<name>\&.remote\fR -and -\fBbranch\&.<name>\&.merge\fR)\&. A missing branchname defaults to the current one\&. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case\&. +A branch B may be set up to build on top of a branch X (configured with +\fBbranch\&.<name>\&.merge\fR) at a remote R (configured with the branch X taken from remote R, typically found at +\fBrefs/remotes/R/X\fR\&. .RE .PP \fI[<branchname>]@{push}\fR, e\&.g\&. \fImaster@{push}\fR, \fI@{push}\fR @@ -276,8 +272,8 @@ were run while \fBbranchname\fR was checked out (or the current \fBHEAD\fR -if no branchname is specified)\&. Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i\&.e\&., something in -\fBrefs/remotes/\fR)\&. +if no branchname is specified)\&. Like for +\fI@{upstream}\fR, we report the remote\-tracking branch that corresponds to that branch at the remote\&. .sp Here\(cqs an example to make it more clear: .sp diff --git a/man7/gitsubmodules.7 b/man7/gitsubmodules.7 index 1c5a54a04..605fac1e7 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITSUBMODULES" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITSUBMODULES" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial-2.7 b/man7/gittutorial-2.7 index 8b5b93086..1229bc638 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITTUTORIAL\-2" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITTUTORIAL\-2" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gittutorial.7 b/man7/gittutorial.7 index f23e79632..5105563c4 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITTUTORIAL" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITTUTORIAL" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man7/gitworkflows.7 b/man7/gitworkflows.7 index feaa941a9..f684606d1 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: 07/12/2022 +.\" Date: 07/18/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.1.38.gf2e5255fc2 +.\" Source: Git 2.37.1.188.g71a8fab31b .\" Language: English .\" -.TH "GITWORKFLOWS" "7" "07/12/2022" "Git 2\&.37\&.1\&.38\&.gf2e5255" "Git Manual" +.TH "GITWORKFLOWS" "7" "07/18/2022" "Git 2\&.37\&.1\&.188\&.g71a8fa" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- |