Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions RelNotes/2.53.0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ UI, Workflows & Features
* The use of "revision" (a connected set of commits) has been
clarified in the "git replay" documentation.

* A help message from "git branch" now mentions "git help" instead of
"man" when suggesting to read some documentation.

* "git repo struct" learned to take "-z" as a synonym to "--format=nul".


Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
Expand All @@ -51,6 +56,10 @@ Performance, Internal Implementation, Development Support etc.

* Code refactoring around object database sources.

* Halve the memory consumed by artificial filepairs created during
"git diff --find-copioes-harder", also making the operation run
faster.


Fixes since v2.52
-----------------
Expand Down Expand Up @@ -150,9 +159,18 @@ Fixes since v2.52
* The way patience diff finds LCS has been optimized.
(merge c7e3b8085b yc/xdiff-patience-optim later to maint).

* Recent optimization to "last-modified" command introduced use of
uninitialized block of memory, which has been corrected.
(merge fe4e60759b tc/last-modified-active-paths-optimization later to maint).

* "git last-modified" used to mishandle "--" to mark the beginning of
pathspec, which has been corrected.
(merge 05491b90ce js/last-modified-with-sparse-checkouts later to maint).

* Other code cleanup, docfix, build fix, etc.
(merge 46207a54cc qj/doc-http-bad-want-response later to maint).
(merge df90eccd93 kh/doc-commit-extra-references later to maint).
(merge f18aa68861 rs/xmkstemp-simplify later to maint).
(merge fddba8f737 ja/doc-synopsis-style later to maint).
(merge 22ce0cb639 en/xdiff-cleanup-2 later to maint).
(merge 8ef7355a8f je/doc-pull later to maint).
4 changes: 2 additions & 2 deletions git-pull.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ You can also set the configuration options `pull.rebase`, `pull.squash`,
or `pull.ff` with your preferred behaviour.

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`.
want to handle, you can safely abort it with `git merge --abort` or
`git rebase --abort`.

OPTIONS
-------
Expand Down
6 changes: 3 additions & 3 deletions git-pull.html
Original file line number Diff line number Diff line change
Expand Up @@ -497,8 +497,8 @@ <h2 id="_description">DESCRIPTION</h2>
</div>
<div class="paragraph">
<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>
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>
Expand Down Expand Up @@ -1967,7 +1967,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2025-11-30 20:20:54 -0800
Last updated 2025-12-14 20:08:20 +0900
</div>
</div>
</body>
Expand Down
11 changes: 6 additions & 5 deletions git-repo.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ git-repo - Retrieve information about the repository
SYNOPSIS
--------
[synopsis]
git repo info [--format=(keyvalue|nul)] [-z] [--all | <key>...]
git repo structure [--format=(table|keyvalue|nul)]
git repo info [--format=(keyvalue|nul) | -z] [--all | <key>...]
git repo structure [--format=(table|keyvalue|nul) | -z]

DESCRIPTION
-----------
Expand All @@ -19,7 +19,7 @@ THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.

COMMANDS
--------
`info [--format=(keyvalue|nul)] [-z] [--all | <key>...]`::
`info [--format=(keyvalue|nul) | -z] [--all | <key>...]`::
Retrieve metadata-related information about the current repository. Only
the requested data will be returned based on their keys (see "INFO KEYS"
section below).
Expand All @@ -44,13 +44,12 @@ supported:
+
`-z` is an alias for `--format=nul`.

`structure [--format=(table|keyvalue|nul)]`::
`structure [--format=(table|keyvalue|nul) | -z]`::
Retrieve statistics about the current repository structure. The
following kinds of information are reported:
+
* Reference counts categorized by type
* Reachable object counts categorized by type

+
The output format can be chosen through the flag `--format`. Three formats are
supported:
Expand All @@ -72,6 +71,8 @@ supported:
the delimiter between the key and value instead of '='. Unlike the
`keyvalue` format, values containing "unusual" characters are never
quoted.
+
`-z` is an alias for `--format=nul`.

INFO KEYS
---------
Expand Down
22 changes: 11 additions & 11 deletions git-repo.html
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ <h2 id="_name">NAME</h2>
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><code>git</code> <code>repo</code> <code>info</code> [<code>--format=</code>(<code>keyvalue</code>|<code>nul</code>)] [<code>-z</code>] [<code>--all</code> | <em>&lt;key&gt;</em>&#8230;&#8203;]
<code>git</code> <code>repo</code> <code>structure</code> [<code>--format=</code>(<code>table</code>|<code>keyvalue</code>|<code>nul</code>)]</pre>
<pre class="content"><code>git</code> <code>repo</code> <code>info</code> [<code>--format=</code>(<code>keyvalue</code>|<code>nul</code>) | <code>-z</code>] [<code>--all</code> | <em>&lt;key&gt;</em>&#8230;&#8203;]
<code>git</code> <code>repo</code> <code>structure</code> [<code>--format=</code>(<code>table</code>|<code>keyvalue</code>|<code>nul</code>) | <code>-z</code>]</pre>
</div>
</div>
</div>
Expand All @@ -473,7 +473,7 @@ <h2 id="_commands">COMMANDS</h2>
<div class="sectionbody">
<div class="dlist">
<dl>
<dt class="hdlist1"><code>info</code> [<code>--format=</code>(<code>keyvalue</code>|<code>nul</code>)] [<code>-z</code>] [<code>--all</code> | <em>&lt;key&gt;</em>...]</dt>
<dt class="hdlist1"><code>info</code> [<code>--format=</code>(<code>keyvalue</code>|<code>nul</code>) | <code>-z</code>] [<code>--all</code> | <em>&lt;key&gt;</em>...]</dt>
<dd>
<p>Retrieve metadata-related information about the current repository. Only
the requested data will be returned based on their keys (see "INFO KEYS"
Expand Down Expand Up @@ -508,7 +508,7 @@ <h2 id="_commands">COMMANDS</h2>
</dl>
</div>
</dd>
<dt class="hdlist1"><code>structure</code> [<code>--format=</code>(<code>table</code>|<code>keyvalue</code>|<code>nul</code>)]</dt>
<dt class="hdlist1"><code>structure</code> [<code>--format=</code>(<code>table</code>|<code>keyvalue</code>|<code>nul</code>) | <code>-z</code>]</dt>
<dd>
<p>Retrieve statistics about the current repository structure. The
following kinds of information are reported:</p>
Expand All @@ -519,16 +519,10 @@ <h2 id="_commands">COMMANDS</h2>
</li>
<li>
<p>Reachable object counts categorized by type</p>
</li>
</ul>
</div>
<div class="paragraph">
<p>The output format can be chosen through the flag <code>--format</code>. Three formats are
supported:</p>
</div>
<div class="paragraph">
<p>+</p>
</div>
<div class="dlist">
<dl>
<dt class="hdlist1"><code>table</code></dt>
Expand All @@ -551,9 +545,15 @@ <h2 id="_commands">COMMANDS</h2>
the delimiter between the key and value instead of <em>=</em>. Unlike the
<code>keyvalue</code> format, values containing "unusual" characters are never
quoted.</p>
<div class="paragraph">
<p><code>-z</code> is an alias for <code>--format=nul</code>.</p>
</div>
</dd>
</dl>
</div>
</li>
</ul>
</div>
</dd>
</dl>
</div>
Expand Down Expand Up @@ -645,7 +645,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2025-11-30 20:20:54 -0800
Last updated 2025-12-14 20:08:20 +0900
</div>
</div>
</body>
Expand Down
2 changes: 0 additions & 2 deletions gitdatamodel.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ there will no longer be a branch that points at the old commit.
The old commit is recorded in the current branch's <<reflogs,reflog>>,
so it is still "reachable", but when the reflog entry expires it may
become unreachable and get deleted.

the old commit will usually not be reachable, so it may be deleted eventually.
Reachable objects will never be deleted.

[[index]]
Expand Down
7 changes: 2 additions & 5 deletions gitdatamodel.html
Original file line number Diff line number Diff line change
Expand Up @@ -857,14 +857,11 @@ <h2 id="references">REFERENCES</h2>
The old commit is recorded in the current branch&#8217;s <a href="#reflogs">reflog</a>,
so it is still "reachable", but when the reflog entry expires it may
become unreachable and get deleted.
Reachable objects will never be deleted.
</td>
</tr>
</table>
</div>
<div class="paragraph">
<p>the old commit will usually not be reachable, so it may be deleted eventually.
Reachable objects will never be deleted.</p>
</div>
</div>
</div>
<div class="sect1">
Expand Down Expand Up @@ -986,7 +983,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2025-11-30 20:20:54 -0800
Last updated 2025-12-14 20:08:20 +0900
</div>
</div>
</body>
Expand Down