From 4dc64b528c3af83037083688f542761bd89fc262 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 9 Nov 2023 02:06:13 +0900 Subject: Autogenerated manpages for v2.43.0-rc1 --- man1/git-add.1 | 6 +++--- man1/git-am.1 | 6 +++--- man1/git-annotate.1 | 6 +++--- man1/git-apply.1 | 6 +++--- man1/git-archimport.1 | 6 +++--- man1/git-archive.1 | 6 +++--- man1/git-bisect.1 | 6 +++--- man1/git-blame.1 | 6 +++--- man1/git-branch.1 | 6 +++--- man1/git-bugreport.1 | 6 +++--- man1/git-bundle.1 | 6 +++--- man1/git-cat-file.1 | 6 +++--- man1/git-check-attr.1 | 6 +++--- man1/git-check-ignore.1 | 6 +++--- man1/git-check-mailmap.1 | 6 +++--- man1/git-check-ref-format.1 | 6 +++--- man1/git-checkout-index.1 | 6 +++--- man1/git-checkout.1 | 6 +++--- man1/git-cherry-pick.1 | 6 +++--- man1/git-cherry.1 | 6 +++--- man1/git-citool.1 | 6 +++--- man1/git-clean.1 | 6 +++--- man1/git-clone.1 | 6 +++--- man1/git-column.1 | 6 +++--- man1/git-commit-graph.1 | 6 +++--- man1/git-commit-tree.1 | 6 +++--- man1/git-commit.1 | 6 +++--- man1/git-config.1 | 6 +++--- man1/git-count-objects.1 | 6 +++--- man1/git-credential-cache--daemon.1 | 6 +++--- man1/git-credential-cache.1 | 6 +++--- man1/git-credential-store.1 | 6 +++--- man1/git-credential.1 | 6 +++--- man1/git-cvsexportcommit.1 | 6 +++--- man1/git-cvsimport.1 | 6 +++--- man1/git-cvsserver.1 | 6 +++--- man1/git-daemon.1 | 6 +++--- man1/git-describe.1 | 6 +++--- man1/git-diagnose.1 | 6 +++--- man1/git-diff-files.1 | 6 +++--- man1/git-diff-index.1 | 6 +++--- man1/git-diff-tree.1 | 6 +++--- man1/git-diff.1 | 6 +++--- man1/git-difftool.1 | 6 +++--- man1/git-fast-export.1 | 6 +++--- man1/git-fast-import.1 | 6 +++--- man1/git-fetch-pack.1 | 6 +++--- man1/git-fetch.1 | 6 +++--- man1/git-filter-branch.1 | 6 +++--- man1/git-fmt-merge-msg.1 | 6 +++--- man1/git-for-each-ref.1 | 6 +++--- man1/git-for-each-repo.1 | 6 +++--- man1/git-format-patch.1 | 6 +++--- man1/git-fsck-objects.1 | 6 +++--- man1/git-fsck.1 | 6 +++--- man1/git-fsmonitor--daemon.1 | 6 +++--- man1/git-gc.1 | 6 +++--- man1/git-get-tar-commit-id.1 | 6 +++--- man1/git-grep.1 | 6 +++--- man1/git-gui.1 | 6 +++--- man1/git-hash-object.1 | 6 +++--- man1/git-help.1 | 6 +++--- man1/git-hook.1 | 6 +++--- man1/git-http-backend.1 | 6 +++--- man1/git-http-fetch.1 | 6 +++--- man1/git-http-push.1 | 6 +++--- man1/git-imap-send.1 | 6 +++--- man1/git-index-pack.1 | 6 +++--- man1/git-init-db.1 | 6 +++--- man1/git-init.1 | 6 +++--- man1/git-instaweb.1 | 6 +++--- man1/git-interpret-trailers.1 | 6 +++--- man1/git-log.1 | 6 +++--- man1/git-ls-files.1 | 6 +++--- man1/git-ls-remote.1 | 6 +++--- man1/git-ls-tree.1 | 6 +++--- man1/git-mailinfo.1 | 6 +++--- man1/git-mailsplit.1 | 6 +++--- man1/git-maintenance.1 | 6 +++--- man1/git-merge-base.1 | 6 +++--- man1/git-merge-file.1 | 32 ++++++++++++++++++++++++-------- man1/git-merge-index.1 | 6 +++--- man1/git-merge-one-file.1 | 6 +++--- man1/git-merge-tree.1 | 6 +++--- man1/git-merge.1 | 6 +++--- man1/git-mergetool--lib.1 | 6 +++--- man1/git-mergetool.1 | 6 +++--- man1/git-mktag.1 | 6 +++--- man1/git-mktree.1 | 6 +++--- man1/git-multi-pack-index.1 | 6 +++--- man1/git-mv.1 | 6 +++--- man1/git-name-rev.1 | 6 +++--- man1/git-notes.1 | 6 +++--- man1/git-p4.1 | 6 +++--- man1/git-pack-objects.1 | 6 +++--- man1/git-pack-redundant.1 | 6 +++--- man1/git-pack-refs.1 | 6 +++--- man1/git-patch-id.1 | 6 +++--- man1/git-prune-packed.1 | 6 +++--- man1/git-prune.1 | 6 +++--- man1/git-pull.1 | 6 +++--- man1/git-push.1 | 6 +++--- man1/git-quiltimport.1 | 6 +++--- man1/git-range-diff.1 | 6 +++--- man1/git-read-tree.1 | 6 +++--- man1/git-rebase.1 | 6 +++--- man1/git-receive-pack.1 | 6 +++--- man1/git-reflog.1 | 6 +++--- man1/git-remote-ext.1 | 6 +++--- man1/git-remote-fd.1 | 6 +++--- man1/git-remote.1 | 6 +++--- man1/git-repack.1 | 6 +++--- man1/git-replace.1 | 6 +++--- man1/git-request-pull.1 | 6 +++--- man1/git-rerere.1 | 6 +++--- man1/git-reset.1 | 6 +++--- man1/git-restore.1 | 6 +++--- man1/git-rev-list.1 | 6 +++--- man1/git-rev-parse.1 | 6 +++--- man1/git-revert.1 | 6 +++--- man1/git-rm.1 | 6 +++--- man1/git-send-email.1 | 6 +++--- man1/git-send-pack.1 | 6 +++--- man1/git-sh-i18n--envsubst.1 | 6 +++--- man1/git-sh-i18n.1 | 6 +++--- man1/git-sh-setup.1 | 6 +++--- man1/git-shell.1 | 6 +++--- man1/git-shortlog.1 | 6 +++--- man1/git-show-branch.1 | 6 +++--- man1/git-show-index.1 | 6 +++--- man1/git-show-ref.1 | 24 ++++++++++++++++++------ man1/git-show.1 | 6 +++--- man1/git-sparse-checkout.1 | 6 +++--- man1/git-stage.1 | 6 +++--- man1/git-stash.1 | 6 +++--- man1/git-status.1 | 6 +++--- man1/git-stripspace.1 | 6 +++--- man1/git-submodule.1 | 6 +++--- man1/git-svn.1 | 6 +++--- man1/git-switch.1 | 6 +++--- man1/git-symbolic-ref.1 | 6 +++--- man1/git-tag.1 | 6 +++--- man1/git-unpack-file.1 | 6 +++--- man1/git-unpack-objects.1 | 6 +++--- man1/git-update-index.1 | 6 +++--- man1/git-update-ref.1 | 6 +++--- man1/git-update-server-info.1 | 6 +++--- man1/git-upload-archive.1 | 6 +++--- man1/git-upload-pack.1 | 6 +++--- man1/git-var.1 | 6 +++--- man1/git-verify-commit.1 | 6 +++--- man1/git-verify-pack.1 | 6 +++--- man1/git-verify-tag.1 | 6 +++--- man1/git-version.1 | 6 +++--- man1/git-web--browse.1 | 6 +++--- man1/git-whatchanged.1 | 6 +++--- man1/git-worktree.1 | 6 +++--- man1/git-write-tree.1 | 6 +++--- man1/git.1 | 13 ++++++++++--- man1/gitk.1 | 6 +++--- man1/gitweb.1 | 6 +++--- man1/scalar.1 | 6 +++--- man5/gitattributes.5 | 6 +++--- man5/gitformat-bundle.5 | 6 +++--- man5/gitformat-chunk.5 | 6 +++--- man5/gitformat-commit-graph.5 | 6 +++--- man5/gitformat-index.5 | 6 +++--- man5/gitformat-pack.5 | 15 ++++++++------- man5/gitformat-signature.5 | 6 +++--- man5/githooks.5 | 6 +++--- man5/gitignore.5 | 6 +++--- man5/gitmailmap.5 | 6 +++--- man5/gitmodules.5 | 6 +++--- man5/gitprotocol-capabilities.5 | 6 +++--- man5/gitprotocol-common.5 | 6 +++--- man5/gitprotocol-http.5 | 6 +++--- man5/gitprotocol-pack.5 | 6 +++--- man5/gitprotocol-v2.5 | 6 +++--- man5/gitrepository-layout.5 | 6 +++--- man5/gitweb.conf.5 | 6 +++--- man7/gitcli.7 | 6 +++--- man7/gitcore-tutorial.7 | 6 +++--- man7/gitcredentials.7 | 6 +++--- man7/gitcvs-migration.7 | 6 +++--- man7/gitdiffcore.7 | 6 +++--- man7/giteveryday.7 | 6 +++--- man7/gitfaq.7 | 6 +++--- man7/gitglossary.7 | 6 +++--- man7/gitnamespaces.7 | 6 +++--- man7/gitremote-helpers.7 | 6 +++--- man7/gitrevisions.7 | 6 +++--- man7/gitsubmodules.7 | 6 +++--- man7/gittutorial-2.7 | 6 +++--- man7/gittutorial.7 | 6 +++--- man7/gitworkflows.7 | 6 +++--- 195 files changed, 633 insertions(+), 597 deletions(-) diff --git a/man1/git-add.1 b/man1/git-add.1 index 94c0f7cfe..673867331 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-ADD" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-ADD" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-am.1 b/man1/git-am.1 index 7f4b421cd..4d9702869 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-AM" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-AM" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-annotate.1 b/man1/git-annotate.1 index 8c2de37f9..4e6bcf50f 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-ANNOTATE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-ANNOTATE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-apply.1 b/man1/git-apply.1 index 2243d7f35..4716b88ba 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-APPLY" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-APPLY" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archimport.1 b/man1/git-archimport.1 index 266939d4b..e5dc22908 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-ARCHIMPORT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-ARCHIMPORT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-archive.1 b/man1/git-archive.1 index 1a20fcbb3..e132a3185 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-ARCHIVE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-ARCHIVE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bisect.1 b/man1/git-bisect.1 index 64d68d3f5..6df5c707b 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-BISECT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-BISECT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-blame.1 b/man1/git-blame.1 index a8bf24cae..014f1f4b7 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-BLAME" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-BLAME" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-branch.1 b/man1/git-branch.1 index 49d5e2afd..a813da9db 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-BRANCH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-BRANCH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bugreport.1 b/man1/git-bugreport.1 index 6b3bf1215..8ae18208c 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-BUGREPORT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-BUGREPORT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-bundle.1 b/man1/git-bundle.1 index 2867e54cf..703188ff0 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-BUNDLE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-BUNDLE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cat-file.1 b/man1/git-cat-file.1 index 5eff1b393..10bdb0de8 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CAT\-FILE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CAT\-FILE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-attr.1 b/man1/git-check-attr.1 index 6a7345704..bc7b53a6c 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHECK\-ATTR" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHECK\-ATTR" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ignore.1 b/man1/git-check-ignore.1 index 65edbb3aa..736fa531e 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHECK\-IGNORE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHECK\-IGNORE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-mailmap.1 b/man1/git-check-mailmap.1 index 58e0d9be6..4805c76ea 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHECK\-MAILMAP" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-check-ref-format.1 b/man1/git-check-ref-format.1 index 18268a795..8673bff38 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHECK\-REF\-FORMAT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout-index.1 b/man1/git-checkout-index.1 index 0995bb142..703c638a0 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHECKOUT\-INDEX" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index 734d600a4..fa78a3f90 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHECKOUT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry-pick.1 b/man1/git-cherry-pick.1 index 5264cfca3..a83f75ac4 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHERRY\-PICK" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHERRY\-PICK" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cherry.1 b/man1/git-cherry.1 index e1b96af5c..fe9ab477a 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CHERRY" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CHERRY" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-citool.1 b/man1/git-citool.1 index ab9131679..7c26107b7 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CITOOL" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CITOOL" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clean.1 b/man1/git-clean.1 index be29be8ac..a17aba971 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CLEAN" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CLEAN" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 4a0a6f633..1556f70e6 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CLONE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CLONE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-column.1 b/man1/git-column.1 index a99a9d7d3..08de5d910 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-COLUMN" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-COLUMN" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-graph.1 b/man1/git-commit-graph.1 index 5dfc1c3fe..15bb4d2d4 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-COMMIT\-GRAPH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit-tree.1 b/man1/git-commit-tree.1 index 888ce46ca..e072a7f5b 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-COMMIT\-TREE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-COMMIT\-TREE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 31457e39e..2a75e7c5b 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-COMMIT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-COMMIT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-config.1 b/man1/git-config.1 index 8d9f071ee..bfa9e0918 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CONFIG" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-count-objects.1 b/man1/git-count-objects.1 index 4c65660e0..9afc30e3f 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-COUNT\-OBJECTS" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache--daemon.1 b/man1/git-credential-cache--daemon.1 index 5bd17da6a..44f2fb026 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE\-\-DAEMON" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-cache.1 b/man1/git-credential-cache.1 index 82786224c..855edbbf8 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CREDENTIAL\-CACHE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential-store.1 b/man1/git-credential-store.1 index 42550b4bb..aa2fecda4 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CREDENTIAL\-STORE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-credential.1 b/man1/git-credential.1 index 34fc9a50e..9f2c02c7f 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CREDENTIAL" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CREDENTIAL" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index d93c04314..279b0b46d 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CVSEXPORTCOMMIT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index fe2e94572..6a0c9262b 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CVSIMPORT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CVSIMPORT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-cvsserver.1 b/man1/git-cvsserver.1 index 518116df5..2629e98b9 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-CVSSERVER" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-CVSSERVER" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-daemon.1 b/man1/git-daemon.1 index c26fd8e99..a2e111791 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DAEMON" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DAEMON" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-describe.1 b/man1/git-describe.1 index a9c13e2ee..85dbafd66 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DESCRIBE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DESCRIBE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diagnose.1 b/man1/git-diagnose.1 index a0690ff15..c0e5e37f8 100644 --- a/man1/git-diagnose.1 +++ b/man1/git-diagnose.1 @@ -2,12 +2,12 @@ .\" Title: git-diagnose .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DIAGNOSE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DIAGNOSE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index 50d778d26..2437db311 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DIFF\-FILES" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DIFF\-FILES" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index b4fddcd06..e12541a85 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DIFF\-INDEX" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DIFF\-INDEX" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index d2fc5c8f5..138155ee6 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DIFF\-TREE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 4a0c7bf9b..14284f35c 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DIFF" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-difftool.1 b/man1/git-difftool.1 index d0fa8b1e8..536b1e3fd 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-DIFFTOOL" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-DIFFTOOL" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-export.1 b/man1/git-fast-export.1 index 8b6077b5a..3ed0cca7a 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FAST\-EXPORT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FAST\-EXPORT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 9e7619863..55eda4272 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FAST\-IMPORT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FAST\-IMPORT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch-pack.1 b/man1/git-fetch-pack.1 index cc1283a7c..09419147b 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FETCH\-PACK" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FETCH\-PACK" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fetch.1 b/man1/git-fetch.1 index f2b38d3c3..9e1a10c7a 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FETCH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FETCH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-filter-branch.1 b/man1/git-filter-branch.1 index 2cf7f7b21..a20c774b4 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FILTER\-BRANCH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FILTER\-BRANCH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fmt-merge-msg.1 b/man1/git-fmt-merge-msg.1 index d73daa818..655f4e4da 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FMT\-MERGE\-MSG" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-ref.1 b/man1/git-for-each-ref.1 index 95a1e8321..f365b9ab9 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FOR\-EACH\-REF" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-for-each-repo.1 b/man1/git-for-each-repo.1 index 60bf83011..b37d4dac9 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FOR\-EACH\-REPO" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index d494e1a0a..3709a2f98 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FORMAT\-PATCH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck-objects.1 b/man1/git-fsck-objects.1 index 365160ff7..04df68776 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FSCK\-OBJECTS" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsck.1 b/man1/git-fsck.1 index 6fd3b45c8..bc5ef3c37 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FSCK" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FSCK" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-fsmonitor--daemon.1 b/man1/git-fsmonitor--daemon.1 index 7c1a5e5ae..beedbd6a2 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-FSMONITOR\-\-DAEMON" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gc.1 b/man1/git-gc.1 index 8f77da212..41ebfbeb8 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-GC" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-GC" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "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 7da7940ec..036ac92dd 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-GET\-TAR\-COMMIT\-ID" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-grep.1 b/man1/git-grep.1 index 4ea845be6..761fa44fc 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-GREP" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-GREP" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-gui.1 b/man1/git-gui.1 index 22a603387..cf30983a0 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-GUI" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-GUI" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hash-object.1 b/man1/git-hash-object.1 index f82de1d63..d61398fe1 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-HASH\-OBJECT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-HASH\-OBJECT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-help.1 b/man1/git-help.1 index 4fbf0c444..8fa6cc036 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-HELP" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-HELP" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-hook.1 b/man1/git-hook.1 index f50b68e20..aad931d92 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-HOOK" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-HOOK" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-backend.1 b/man1/git-http-backend.1 index b703f2d0e..c8731677d 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-HTTP\-BACKEND" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-HTTP\-BACKEND" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-fetch.1 b/man1/git-http-fetch.1 index 801127ec8..36efc67dd 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-HTTP\-FETCH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-HTTP\-FETCH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index 4fa3712e0..b56a91195 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-HTTP\-PUSH" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-imap-send.1 b/man1/git-imap-send.1 index 1f184ef26..786869e2a 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-IMAP\-SEND" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-IMAP\-SEND" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-index-pack.1 b/man1/git-index-pack.1 index bf44eb38e..57b7b5447 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-INDEX\-PACK" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-INDEX\-PACK" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init-db.1 b/man1/git-init-db.1 index 1d1992421..2115173eb 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-INIT\-DB" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-INIT\-DB" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-init.1 b/man1/git-init.1 index b6c5904e7..020ec7dac 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-INIT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-INIT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-instaweb.1 b/man1/git-instaweb.1 index c2e3b7f92..af75724dc 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-INSTAWEB" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-INSTAWEB" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-interpret-trailers.1 b/man1/git-interpret-trailers.1 index 72e6cbec0..867abeaed 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-INTERPRET\-TRAILERS" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-log.1 b/man1/git-log.1 index 924a59099..862b40824 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-LOG" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-LOG" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-files.1 b/man1/git-ls-files.1 index fbec13164..2986659ee 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-LS\-FILES" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-LS\-FILES" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-remote.1 b/man1/git-ls-remote.1 index a42ef09b0..c1d2045a7 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-LS\-REMOTE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-LS\-REMOTE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-ls-tree.1 b/man1/git-ls-tree.1 index 16cfbbc29..1d079be00 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-LS\-TREE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-LS\-TREE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index e30756ba1..0eb24390a 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-MAILINFO" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-MAILINFO" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-mailsplit.1 b/man1/git-mailsplit.1 index cd88a9635..1ce136255 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-MAILSPLIT" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-MAILSPLIT" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-maintenance.1 b/man1/git-maintenance.1 index bf1646d1b..f8d9645bd 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-MAINTENANCE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-MAINTENANCE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1 index c6c131a94..e37072986 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-MERGE\-BASE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-MERGE\-BASE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man1/git-merge-file.1 b/man1/git-merge-file.1 index a6493ca3c..c797b6a23 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 -.\" Date: 2023-11-03 +.\" Date: 2023-11-08 .\" Manual: Git Manual -.\" Source: Git 2.43.0.rc0.23.g8be77c5de6 +.\" Source: Git 2.43.0.rc1 .\" Language: English .\" -.TH "GIT\-MERGE\-FILE" "1" "2023\-11\-03" "Git 2\&.43\&.0\&.rc0\&.23\&.g8" "Git Manual" +.TH "GIT\-MERGE\-FILE" "1" "2023\-11\-08" "Git 2\&.43\&.0\&.rc1" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,14 +34,14 @@ git-merge-file \- Run a three\-way file merge .nf \fIgit merge\-file\fR [\-L [\-L [\-L ]]] [\-\-ours|\-\-theirs|\-\-union] [\-p|\-\-stdout] [\-q|\-\-quiet] [\-\-marker\-size=] - [\-\-[no\-]diff3] + [\-\-[no\-]diff3] [\-\-object\-id] .fi .sp .SH "DESCRIPTION" .sp -\fIgit merge\-file\fR incorporates all changes that lead from the \fB\fR to \fB\fR into \fB\fR\&. The result ordinarily goes into \fB\fR\&. \fIgit merge\-file\fR is useful for combining separate changes to an original\&. Suppose \fB\fR is the original, and both \fB\fR and \fB\fR are modifications of \fB\fR, then \fIgit merge\-file\fR combines both changes\&. +Given three files \fB\fR, \fB\fR and \fB\fR, \fIgit merge\-file\fR incorporates all changes that lead from \fB\fR to \fB\fR into \fB\fR\&. The result ordinarily goes into \fB\fR\&. \fIgit merge\-file\fR is useful for combining separate changes to an original\&. Suppose \fB\fR is the original, and both \fB\fR and \fB\fR are modifications of \fB\fR, then \fIgit merge\-file\fR combines both changes\&. .sp -A conflict occurs if both \fB\fR and \fB\fR have changes in a common segment of lines\&. If a conflict is found, \fIgit merge\-file\fR normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers\&. A typical conflict will look like this: +A conflict occurs if both \fB\fR and \fB\fR have changes in a common segment of lines\&. If a conflict is found, \fIgit merge\-file\fR normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers\&. A typical conflict will look like this: .sp .if n \{\ .RS 4 @@ -57,13 +57,24 @@ lines in file B .RE .\} .sp -If there are conflicts, the user should edit the result and delete one of the alternatives\&. When \fB\-\-ours\fR, \fB\-\-theirs\fR, or \fB\-\-union\fR option is in effect, however, these conflicts are resolved favouring lines from \fB\fR, lines from \fB\fR, or lines from both respectively\&. The length of the conflict markers can be given with the \fB\-\-marker\-size\fR option\&. +If there are conflicts, the user should edit the result and delete one of the alternatives\&. When \fB\-\-ours\fR, \fB\-\-theirs\fR, or \fB\-\-union\fR option is in effect, however, these conflicts are resolved favouring lines from \fB\fR, lines from \fB\fR, or lines from both respectively\&. The length of the conflict markers can be given with the \fB\-\-marker\-size\fR option\&. +.sp +If \fB\-\-object\-id\fR is specified, exactly the same behavior occurs, except that instead of specifying what to merge as files, it is specified as a list of object IDs referring to blobs\&. .sp The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts)\&. If the merge was clean, the exit value is 0\&. .sp \fIgit merge\-file\fR is designed to be a minimal clone of RCS \fImerge\fR; that is, it implements all of RCS \fImerge\fR\*(Aqs functionality which is needed by \fBgit\fR(1)\&. .SH "OPTIONS" .PP +\-\-object\-id +.RS 4 +Specify the contents to merge as blobs in the current repository instead of files\&. In this case, the operation must take place within a valid repository\&. +.sp +If the +\fB\-p\fR +option is specified, the merged file (including conflicts, if any) goes to standard output as normal; otherwise, the merged file is written to the object store and the object ID of its blob is written to standard output\&. +.RE +.PP \-L