Autogenerated HTML docs for v2.43.0-254-ga260

git · Jan 2, 2024 · 07b9e54 · 07b9e54
1 parent 7ae46b4
commit 07b9e54
Show file tree

Hide file tree

Showing 54 changed files with 147 additions and 71 deletions.
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Contribution to the Git Project</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Object Walk</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt
@@ -134,6 +134,14 @@ Fixes since v2.43
    which has been corrected.
    (merge 18ce48918c jx/fetch-atomic-error-message-fix later to maint).
 
+ * Command line completion script (in contrib/) learned to work better
+   with the reftable backend.
+   (merge 44dbb3bf29 sh/completion-with-reftable later to maint).
+
+ * "git status" is taught to show both the branch being bisected and
+   being rebased when both are in effect at the same time.
+   (merge 990adccbdf rj/status-bisect-while-rebase later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 50f1abcff6 js/packfile-h-typofix later to maint).
    (merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint).
@@ -151,3 +159,7 @@ Fixes since v2.43
    (merge 6d6f1cd7ee jc/doc-misspelt-refs-fix later to maint).
    (merge 37e8d795be sp/test-i18ngrep later to maint).
    (merge fbc6526ea6 rs/t6300-compressed-size-fix later to maint).
+   (merge 45184afb4d rs/rebase-use-strvec-pushf later to maint).
+   (merge a762af3dfd jc/retire-cas-opt-name-constant later to maint).
+   (merge de7c27a186 la/trailer-cleanups later to maint).
+   (merge d44b517137 jc/orphan-unborn later to maint).
diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Reviewing Patches in the Git Project</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/SubmittingPatches.html b/SubmittingPatches.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Submitting Patches</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/ToolsForGit.html b/ToolsForGit.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Tools for developing Git</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/everyday.html b/everyday.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Everyday Git With 20 Commands Or So</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-checkout.html b/git-checkout.html
@@ -1052,7 +1052,7 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Create a new <em>orphan</em> branch, named <code>&lt;new-branch&gt;</code>, started from
+        Create a new unborn branch, named <code>&lt;new-branch&gt;</code>, started from
         <code>&lt;start-point&gt;</code> and switch to it.  The first commit made on this
         new branch will have no parents and it will be the root of a new
         history totally disconnected from all the other branches and
@@ -1635,7 +1635,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:18 PST
+ 2024-01-02 14:28:43 PST
 </div>
 </div>
 </body>

diff --git a/git-checkout.txt b/git-checkout.txt
@@ -217,7 +217,7 @@ variable.
 	below for details.
 
 --orphan <new-branch>::
-	Create a new 'orphan' branch, named `<new-branch>`, started from
+	Create a new unborn branch, named `<new-branch>`, started from
 	`<start-point>` and switch to it.  The first commit made on this
 	new branch will have no parents and it will be the root of a new
 	history totally disconnected from all the other branches and

diff --git a/git-config.html b/git-config.html
@@ -2334,7 +2334,7 @@ <h3 id="_variables">Variables</h3>
 <dd>
 <p>
                 Advice shown when a user tries to create a worktree from an
-                invalid reference, to instruct how to create a new orphan
+                invalid reference, to instruct how to create a new unborn
                 branch instead.
 </p>
 </dd>

diff --git a/git-remote-helpers.html b/git-remote-helpers.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>git-remote-helpers</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-switch.html b/git-switch.html
@@ -1010,7 +1010,7 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Create a new <em>orphan</em> branch, named <code>&lt;new-branch&gt;</code>. All
+        Create a new unborn branch, named <code>&lt;new-branch&gt;</code>. All
         tracked files are removed.
 </p>
 </dd>
@@ -1203,7 +1203,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:18 PST
+ 2024-01-02 14:28:43 PST
 </div>
 </div>
 </body>

diff --git a/git-switch.txt b/git-switch.txt
@@ -176,7 +176,7 @@ name, the guessing is aborted.  You can explicitly give a name with
 	`branch.autoSetupMerge` configuration variable is true.
 
 --orphan <new-branch>::
-	Create a new 'orphan' branch, named `<new-branch>`. All
+	Create a new unborn branch, named `<new-branch>`. All
 	tracked files are removed.
 
 --ignore-other-worktrees::

diff --git a/git-worktree.html b/git-worktree.html
@@ -840,7 +840,7 @@ <h2 id="_commands">COMMANDS</h2>
 <div class="paragraph"><p>If <code>&lt;commit-ish&gt;</code> is omitted, neither <code>--detach</code>, or <code>--orphan</code> is
 used, and there are no valid local branches (or remote branches if
 <code>--guess-remote</code> is specified) then, as a convenience, the new worktree is
-associated with a new orphan branch named <code>&lt;branch&gt;</code> (after
+associated with a new unborn branch named <code>&lt;branch&gt;</code> (after
 <code>$(basename &lt;path&gt;)</code> if neither <code>-b</code> or <code>-B</code> is used) as if <code>--orphan</code> was
 passed to the command. In the event the repository has a remote and
 <code>--guess-remote</code> is used, but no remote or local branches exist, then the
@@ -1053,7 +1053,7 @@ <h2 id="_options">OPTIONS</h2>
 <dd>
 <p>
         With <code>add</code>, make the new worktree and index empty, associating
-        the worktree with a new orphan/unborn branch named <code>&lt;new-branch&gt;</code>.
+        the worktree with a new unborn branch named <code>&lt;new-branch&gt;</code>.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -1399,7 +1399,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-20 16:56:50 PDT
+ 2024-01-02 14:28:43 PST
 </div>
 </div>
 </body>

diff --git a/git-worktree.txt b/git-worktree.txt
@@ -99,7 +99,7 @@ command will refuse to create the worktree (unless `--force` is used).
 If `<commit-ish>` is omitted, neither `--detach`, or `--orphan` is
 used, and there are no valid local branches (or remote branches if
 `--guess-remote` is specified) then, as a convenience, the new worktree is
-associated with a new orphan branch named `<branch>` (after
+associated with a new unborn branch named `<branch>` (after
 `$(basename <path>)` if neither `-b` or `-B` is used) as if `--orphan` was
 passed to the command. In the event the repository has a remote and
 `--guess-remote` is used, but no remote or local branches exist, then the
@@ -234,7 +234,7 @@ This can also be set up as the default behaviour by using the
 
 --orphan::
 	With `add`, make the new worktree and index empty, associating
-	the worktree with a new orphan/unborn branch named `<new-branch>`.
+	the worktree with a new unborn branch named `<new-branch>`.
 
 --porcelain::
 	With `list`, output in an easy-to-parse format for scripts.

diff --git a/gitglossary.html b/gitglossary.html
@@ -1284,6 +1284,17 @@ <h2 id="_description">DESCRIPTION</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+<a id="def_orphan"></a>orphan
+</dt>
+<dd>
+<p>
+        The act of getting on a <a href="#def_branch">branch</a> that does not
+        exist yet (i.e., an <a href="#def_unborn">unborn</a> branch).  After
+        such an operation, the commit first created becomes a commit
+        without a parent, starting a new history.
+</p>
+</dd>
+<dt class="hdlist1">
 <a id="def_origin"></a>origin
 </dt>
 <dd>
@@ -1927,6 +1938,22 @@ <h2 id="_description">DESCRIPTION</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+<a id="def_unborn"></a>unborn
+</dt>
+<dd>
+<p>
+        The <a href="#def_HEAD">HEAD</a> can point at a <a href="#def_branch">branch</a>
+        that does not yet exist and that does not have any commit on
+        it yet, and such a branch is called an unborn branch.  The
+        most typical way users encounter an unborn branch is by
+        creating a repository anew without cloning from elsewhere.
+        The HEAD would point at the <em>main</em> (or <em>master</em>, depending
+        on your configuration) branch that is yet to be born.  Also
+        some operations can get you on an unborn branch with their
+        <a href="#def_orphan">orphan</a> option.
+</p>
+</dd>
+<dt class="hdlist1">
 <a id="def_unmerged_index"></a>unmerged index
 </dt>
 <dd>

diff --git a/glossary-content.txt b/glossary-content.txt
@@ -314,6 +314,12 @@ This commit is referred to as a "merge commit", or sometimes just a
 [[def_octopus]]octopus::
 	To <<def_merge,merge>> more than two <<def_branch,branches>>.
 
+[[def_orphan]]orphan::
+	The act of getting on a <<def_branch,branch>> that does not
+	exist yet (i.e., an <<def_unborn,unborn>> branch).  After
+	such an operation, the commit first created becomes a commit
+	without a parent, starting a new history.
+
 [[def_origin]]origin::
 	The default upstream <<def_repository,repository>>. Most projects have
 	at least one upstream project which they track. By default
@@ -697,6 +703,18 @@ The most notable example is `HEAD`.
 	object,
 	etc.
 
+[[def_unborn]]unborn::
+	The <<def_HEAD,HEAD>> can point at a <<def_branch,branch>>
+	that does not yet exist and that does not have any commit on
+	it yet, and such a branch is called an unborn branch.  The
+	most typical way users encounter an unborn branch is by
+	creating a repository anew without cloning from elsewhere.
+	The HEAD would point at the 'main' (or 'master', depending
+	on your configuration) branch that is yet to be born.  Also
+	some operations can get you on an unborn branch with their
+	<<def_orphan,orphan>> option.
+
+
 [[def_unmerged_index]]unmerged index::
 	An <<def_index,index>> which contains unmerged
 	<<def_index_entry,index entries>>.

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ <h3 id="_example_mail_to_a_href_mailto_oss_security_lists_openwall_com_oss_secur
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:41 PST
+ 2024-01-02 14:29:06 PST
 </div>
 </div>
 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Keep authoritative canonical history correct with git pull</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -939,7 +939,7 @@ <h1>Keep authoritative canonical history correct with git pull</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:41 PST
+ 2024-01-02 14:29:06 PST
 </div>
 </div>
 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to maintain Git</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -1479,7 +1479,7 @@ <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:41 PST
+ 2024-01-02 14:29:06 PST
 </div>
 </div>
 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to integrate new subcommands</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -864,7 +864,7 @@ <h2 id="_integrating_a_command">Integrating a command</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:39 PST
+ 2024-01-02 14:29:04 PST
 </div>
 </div>
 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to rebase from an internal branch</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -896,7 +896,7 @@ <h1>How to rebase from an internal branch</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:41 PST
+ 2024-01-02 14:29:06 PST
 </div>
 </div>
 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to rebuild from update hook</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -848,7 +848,7 @@ <h1>How to rebuild from update hook</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:41 PST
+ 2024-01-02 14:29:05 PST
 </div>
 </div>
 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to recover a corrupted blob object</h1>
-<span id="revdate">2023-12-27</span>
+<span id="revdate">2024-01-02</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -881,7 +881,7 @@ <h1>How to recover a corrupted blob object</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:41 PST
+ 2024-01-02 14:29:05 PST
 </div>
 </div>
 </body>