Autogenerated HTML docs for v2.51.1-523-gc54a1

Author: gitster

RelNotes/2.52.0.adoc

@@ -131,6 +131,8 @@ Performance, Internal Implementation, Development Support etc.
    and one for xdiff), roll everything into a single libgit.a archive.
    This would help later effort to FFI into Rust.
 
+ * The beginning of SHA1-SHA256 interoperability work.
+
 
 Fixes since v2.51
 -----------------
@@ -380,3 +382,5 @@ including security updates, are included in this release.
    (merge 3860985105 js/unreachable-workaround-for-no-symlink-head later to maint).
    (merge b3ac6e737d kh/doc-continued-paragraph-fix later to maint).
    (merge 2cebca0582 tb/cat-file-objectmode-update later to maint).
+   (merge 96978d7545 js/ci-github-actions-update later to maint).
+   (merge 0c4f1346ca so/t2401-use-test-path-helpers later to maint).

fsck-msgids.adoc

@@ -10,6 +10,12 @@
 `badFilemode`::
 	(INFO) A tree contains a bad filemode entry.
 
+`badGpgsig`::
+	(ERROR) A tag contains a bad (truncated) signature (e.g., `gpgsig`) header.
+
+`badHeaderContinuation`::
+	(ERROR) A continuation header (such as for `gpgsig`) is unexpectedly truncated.
+
 `badName`::
 	(ERROR) An author/committer name is empty.
 

git-fetch.html

@@ -878,6 +878,10 @@ <h2 id="_options">OPTIONS</h2>
 of remotes.&lt;group&gt; in the configuration file.
 (See <a href="git-config.html">git-config(1)</a>).</p>
 </dd>
+</dl>
+</div>
+<div id="fetch-refspec" class="dlist">
+<dl>
 <dt class="hdlist1">&lt;refspec&gt;</dt>
 <dd>
 <p>Specifies which refs to fetch and which local refs to update.

git-fsck.html

@@ -766,6 +766,14 @@ <h2 id="_fsck_messages">FSCK MESSAGES</h2>
 <dd>
 <p>(INFO) A tree contains a bad filemode entry.</p>
 </dd>
+<dt class="hdlist1"><code>badGpgsig</code></dt>
+<dd>
+<p>(ERROR) A tag contains a bad (truncated) signature (e.g., <code>gpgsig</code>) header.</p>
+</dd>
+<dt class="hdlist1"><code>badHeaderContinuation</code></dt>
+<dd>
+<p>(ERROR) A continuation header (such as for <code>gpgsig</code>) is unexpectedly truncated.</p>
+</dd>
 <dt class="hdlist1"><code>badName</code></dt>
 <dd>
 <p>(ERROR) An author/committer name is empty.</p>

git-pull.adoc

@@ -15,68 +15,54 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Incorporates changes from a remote repository into the current branch.
-If the current branch is behind the remote, then by default it will
-fast-forward the current branch to match the remote.  If the current
-branch and the remote have diverged, the user needs to specify how to
-reconcile the divergent branches with `--rebase` or `--no-rebase` (or
-the corresponding configuration option in `pull.rebase`).
-
-More precisely, `git pull` runs `git fetch` with the given parameters
-and then depending on configuration options or command line flags,
-will call either `git rebase` or `git merge` to reconcile diverging
-branches.
-
-<repository> should be the name of a remote repository as
-passed to linkgit:git-fetch[1].  <refspec> can name an
-arbitrary remote ref (for example, the name of a tag) or even
-a collection of refs with corresponding remote-tracking branches
-(e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}),
-but usually it is the name of a branch in the remote repository.
-
-Default values for <repository> and <branch> are read from the
-"remote" and "merge" configuration for the current branch
-as set by linkgit:git-branch[1] `--track`.
-
-Assume the following history exists and the current branch is
-"`master`":
+Integrate changes from a remote repository into the current branch.
 
-------------
-	  A---B---C master on origin
-	 /
-    D---E---F---G master
-	^
-	origin/master in your repository
-------------
+First, `git pull` runs `git fetch` with the same arguments
+(excluding merge options) to fetch remote branch(es).
+Then it decides which remote branch to integrate: if you run `git pull`
+with no arguments this defaults to the <<UPSTREAM-BRANCHES,upstream>>
+for the current branch.
+Then it integrates that branch into the current branch.
 
-Then "`git pull`" will fetch and replay the changes from the remote
-`master` branch since it diverged from the local `master` (i.e., `E`)
-until its current commit (`C`) on top of `master` and record the
-result in a new commit along with the names of the two parent commits
-and a log message from the user describing the changes.
-
-------------
-	  A---B---C origin/master
-	 /         \
-    D---E---F---G---H master
-------------
+There are 4 main options for integrating the remote branch:
 
-See linkgit:git-merge[1] for details, including how conflicts
-are presented and handled.
+1. `git pull --ff-only` will only do "fast-forward" updates: it
+   fails if your local branch has diverged from the remote branch.
+   This is the default.
+2. `git pull --rebase` runs `git rebase`
+3. `git pull --no-rebase` runs `git merge`.
+4. `git pull --squash` runs `git merge --squash`
 
-In Git 1.7.0 or later, to cancel a conflicting merge, use
-`git reset --merge`.  *Warning*: In older versions of Git, running 'git pull'
-with uncommitted changes is discouraged: while possible, it leaves you
-in a state that may be hard to back out of in the case of a conflict.
+You can also set the configuration options `pull.rebase`, `pull.squash`,
+or `pull.ff` with your preferred behaviour.
 
-If any of the remote changes overlap with local uncommitted changes,
-the merge will be automatically canceled and the work tree untouched.
-It is generally best to get any local changes in working order before
-pulling or stash them away with linkgit:git-stash[1].
+If there's a merge conflict during the merge or rebase that you don't
+want to handle, you can safely abort it with `git merge --abort` or `git
+--rebase abort`.
 
 OPTIONS
 -------
 
+<repository>::
+	The "remote" repository to pull from.  This can be either
+	a URL (see the section <<URLS,GIT URLS>> below) or the name
+	of a remote (see the section <<REMOTES,REMOTES>> below).
++
+Defaults to the configured upstream for the current branch, or `origin`.
+See <<UPSTREAM-BRANCHES,UPSTREAM BRANCHES>> below for more on how to
+configure upstreams.
+
+<refspec>::
+	Which branch or other reference(s) to fetch and integrate into the
+	current branch, for example `main` in `git pull origin main`.
+	Defaults to the configured upstream for the current branch.
++
+This can be a branch, tag, or other collection of reference(s).
+See <<fetch-refspec,<refspec>>> below under "Options related to fetching"
+for the full syntax, and <<DEFAULT-BEHAVIOUR,DEFAULT BEHAVIOUR>> below
+for how `git pull` uses this argument to determine which remote branch
+to integrate.
+
 -q::
 --quiet::
 	This is passed to both underlying git-fetch to squelch reporting of
@@ -145,6 +131,7 @@ include::urls-remotes.adoc[]
 
 include::merge-strategies.adoc[]
 
+[[DEFAULT-BEHAVIOUR]]
 DEFAULT BEHAVIOUR
 -----------------
 

git-pull.html

@@ -460,74 +460,45 @@ <h2 id="_synopsis">SYNOPSIS</h2>
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Incorporates changes from a remote repository into the current branch.
-If the current branch is behind the remote, then by default it will
-fast-forward the current branch to match the remote.  If the current
-branch and the remote have diverged, the user needs to specify how to
-reconcile the divergent branches with <code>--rebase</code> or <code>--no-rebase</code> (or
-the corresponding configuration option in <code>pull.rebase</code>).</p>
+<p>Integrate changes from a remote repository into the current branch.</p>
 </div>
 <div class="paragraph">
-<p>More precisely, <code>git</code> <code>pull</code> runs <code>git</code> <code>fetch</code> with the given parameters
-and then depending on configuration options or command line flags,
-will call either <code>git</code> <code>rebase</code> or <code>git</code> <code>merge</code> to reconcile diverging
-branches.</p>
+<p>First, <code>git</code> <code>pull</code> runs <code>git</code> <code>fetch</code> with the same arguments
+(excluding merge options) to fetch remote branch(es).
+Then it decides which remote branch to integrate: if you run <code>git</code> <code>pull</code>
+with no arguments this defaults to the <a href="#UPSTREAM-BRANCHES">upstream</a>
+for the current branch.
+Then it integrates that branch into the current branch.</p>
 </div>
 <div class="paragraph">
-<p>&lt;repository&gt; should be the name of a remote repository as
-passed to <a href="git-fetch.html">git-fetch(1)</a>.  &lt;refspec&gt; can name an
-arbitrary remote ref (for example, the name of a tag) or even
-a collection of refs with corresponding remote-tracking branches
-(e.g., refs/heads/*:refs/remotes/origin/*),
-but usually it is the name of a branch in the remote repository.</p>
+<p>There are 4 main options for integrating the remote branch:</p>
 </div>
-<div class="paragraph">
-<p>Default values for &lt;repository&gt; and &lt;branch&gt; are read from the
-"remote" and "merge" configuration for the current branch
-as set by <a href="git-branch.html">git-branch(1)</a> <code>--track</code>.</p>
-</div>
-<div class="paragraph">
-<p>Assume the following history exists and the current branch is
-"<code>master</code>":</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>          A---B---C master on origin
-         /
-    D---E---F---G master
-        ^
-        origin/master in your repository</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Then "<code>git</code> <code>pull</code>" will fetch and replay the changes from the remote
-<code>master</code> branch since it diverged from the local <code>master</code> (i.e., <code>E</code>)
-until its current commit (<code>C</code>) on top of <code>master</code> and record the
-result in a new commit along with the names of the two parent commits
-and a log message from the user describing the changes.</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>          A---B---C origin/master
-         /         \
-    D---E---F---G---H master</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>See <a href="git-merge.html">git-merge(1)</a> for details, including how conflicts
-are presented and handled.</p>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p><code>git</code> <code>pull</code> <code>--ff-only</code> will only do "fast-forward" updates: it
+fails if your local branch has diverged from the remote branch.
+This is the default.</p>
+</li>
+<li>
+<p><code>git</code> <code>pull</code> <code>--rebase</code> runs <code>git</code> <code>rebase</code></p>
+</li>
+<li>
+<p><code>git</code> <code>pull</code> <code>--no-rebase</code> runs <code>git</code> <code>merge</code>.</p>
+</li>
+<li>
+<p><code>git</code> <code>pull</code> <code>--squash</code> runs <code>git</code> <code>merge</code> <code>--squash</code></p>
+</li>
+</ol>
 </div>
 <div class="paragraph">
-<p>In Git 1.7.0 or later, to cancel a conflicting merge, use
-<code>git</code> <code>reset</code> <code>--merge</code>.  <strong>Warning</strong>: In older versions of Git, running <em>git pull</em>
-with uncommitted changes is discouraged: while possible, it leaves you
-in a state that may be hard to back out of in the case of a conflict.</p>
+<p>You can also set the configuration options <code>pull.rebase</code>, <code>pull.squash</code>,
+or <code>pull.ff</code> with your preferred behaviour.</p>
 </div>
 <div class="paragraph">
-<p>If any of the remote changes overlap with local uncommitted changes,
-the merge will be automatically canceled and the work tree untouched.
-It is generally best to get any local changes in working order before
-pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p>
+<p>If there&#8217;s a merge conflict during the merge or rebase that you don&#8217;t
+want to handle, you can safely abort it with <code>git</code> <code>merge</code> <code>--abort</code> or <code>git</code>
+<code>--rebase</code> <code>abort</code>.</p>
 </div>
 </div>
 </div>
@@ -536,6 +507,30 @@ <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
 <div class="dlist">
 <dl>
+<dt class="hdlist1">&lt;repository&gt;</dt>
+<dd>
+<p>The "remote" repository to pull from.  This can be either
+a URL (see the section <a href="#URLS">GIT URLS</a> below) or the name
+of a remote (see the section <a href="#REMOTES">REMOTES</a> below).</p>
+<div class="paragraph">
+<p>Defaults to the configured upstream for the current branch, or <code>origin</code>.
+See <a href="#UPSTREAM-BRANCHES">UPSTREAM BRANCHES</a> below for more on how to
+configure upstreams.</p>
+</div>
+</dd>
+<dt class="hdlist1">&lt;refspec&gt;</dt>
+<dd>
+<p>Which branch or other reference(s) to fetch and integrate into the
+current branch, for example <code>main</code> in <code>git</code> <code>pull</code> <code>origin</code> <code>main</code>.
+Defaults to the configured upstream for the current branch.</p>
+<div class="paragraph">
+<p>This can be a branch, tag, or other collection of reference(s).
+See <a href="#fetch-refspec">&lt;refspec</a>&gt; below under "Options related to fetching"
+for the full syntax, and <a href="#DEFAULT-BEHAVIOUR">DEFAULT BEHAVIOUR</a> below
+for how <code>git</code> <code>pull</code> uses this argument to determine which remote branch
+to integrate.</p>
+</div>
+</dd>
 <dt class="hdlist1">-q</dt>
 <dt class="hdlist1">--quiet</dt>
 <dd>
@@ -1081,6 +1076,10 @@ <h3 id="_options_related_to_fetching">Options related to fetching</h3>
 (see the section <a href="#URLS">GIT URLS</a> below) or the name
 of a remote (see the section <a href="#REMOTES">REMOTES</a> below).</p>
 </dd>
+</dl>
+</div>
+<div id="fetch-refspec" class="dlist">
+<dl>
 <dt class="hdlist1">&lt;refspec&gt;</dt>
 <dd>
 <p>Specifies which refs to fetch and which local refs to update.
@@ -1764,7 +1763,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_default_behaviour">DEFAULT BEHAVIOUR</h2>
+<h2 id="DEFAULT-BEHAVIOUR">DEFAULT BEHAVIOUR</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Often people use <code>git</code> <code>pull</code> without giving any parameter.
@@ -1955,7 +1954,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-08-25 14:46:08 -0700
+Last updated 2025-10-22 15:04:39 -0700
 </div>
 </div>
 </body>

git-rev-parse.adoc

@@ -324,11 +324,12 @@ The following options are unaffected by `--path-format`:
 	path of the current directory relative to the top-level
 	directory.
 
---show-object-format[=(storage|input|output)]::
-	Show the object format (hash algorithm) used for the repository
-	for storage inside the `.git` directory, input, or output. For
-	input, multiple algorithms may be printed, space-separated.
-	If not specified, the default is "storage".
+--show-object-format[=(storage|input|output|compat)]::
+	Show the object format (hash algorithm) used for the repository for storage
+	inside the `.git` directory, input, output, or compatibility. For input,
+	multiple algorithms may be printed, space-separated. If `compat` is
+	requested and no compatibility algorithm is enabled, prints an empty line. If
+	not specified, the default is "storage".
 
 --show-ref-format::
 	Show the reference storage format used for the repository.

git-rev-parse.html

@@ -856,12 +856,13 @@ <h3 id="_options_for_files">Options for Files</h3>
 path of the current directory relative to the top-level
 directory.</p>
 </dd>
-<dt class="hdlist1">--show-object-format[=(storage|input|output)]</dt>
+<dt class="hdlist1">--show-object-format[=(storage|input|output|compat)]</dt>
 <dd>
-<p>Show the object format (hash algorithm) used for the repository
-for storage inside the .<code>git</code> directory, input, or output. For
-input, multiple algorithms may be printed, space-separated.
-If not specified, the default is "storage".</p>
+<p>Show the object format (hash algorithm) used for the repository for storage
+inside the .<code>git</code> directory, input, output, or compatibility. For input,
+multiple algorithms may be printed, space-separated. If <code>compat</code> is
+requested and no compatibility algorithm is enabled, prints an empty line. If
+not specified, the default is "storage".</p>
 </dd>
 <dt class="hdlist1">--show-ref-format</dt>
 <dd>
@@ -1655,7 +1656,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2025-10-20 15:09:57 -0700
+Last updated 2025-10-22 15:04:39 -0700
 </div>
 </div>
 </body>