Autogenerated HTML docs for v2.48.0-rc0-135-g996f0

Author: gitster

RelNotes/2.48.0.txt

@@ -35,6 +35,10 @@ UI, Workflows & Features
  * "git fetch" honors "remote.<remote>.followRemoteHEAD" settings to
    tweak the remote-tracking HEAD in "refs/remotes/<remote>/HEAD".
 
+ * "git range-diff" learned to optionally show and compare merge
+   commits in the ranges being compared, with the --diff-merges
+   option.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -141,6 +145,22 @@ Performance, Internal Implementation, Development Support etc.
 
  * Build procedure update plus introduction of Meson based builds.
 
+ * Recent reftable updates mistook a NULL return from a request for
+   0-byte allocation as OOM and died unnecessarily, which has been
+   corrected.
+
+ * Reftable backend adds check for upper limit of log's update_index.
+
+ * Start working to make the codebase buildable with -Wsign-compare.
+
+ * Regression fix for 'show-index' when run outside of a repository.
+
+ * The meson-build procedure is integrated into CI to catch and
+   prevent bitrotting.
+
+ * "git refs migrate" learned to also migrate the reflog data across
+   backends.
+
 
 Fixes since v2.47
 -----------------
@@ -280,6 +300,13 @@ Fixes since v2.47
    the revision walker, which has become unnecessary.
    (merge dd1072dfa8 tc/bundle-with-tag-remove-workaround later to maint).
 
+ * GitLab CI updates.
+   (merge c6b43f663e ps/ci-gitlab-update later to maint).
+
+ * Code to reuse objects based on bitmap contents have been tightened
+   to avoid race condition even when multiple packs are involved.
+   (merge 62b3ec8a3f tb/bitmap-fix-pack-reuse later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 77af53f56f aa/t7300-modernize later to maint).
    (merge dcd590a39d bf/t-readme-mention-reftable later to maint).

git-range-diff.html

@@ -453,7 +453,8 @@ <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="verseblock">
 <pre class="content"><em>git range-diff</em> [--color=[&lt;when&gt;]] [--no-color] [&lt;diff-options&gt;]
         [--no-dual-color] [--creation-factor=&lt;factor&gt;]
-        [--left-only | --right-only]
+        [--left-only | --right-only] [--diff-merges=&lt;format&gt;]
+        [--remerge-diff]
         ( &lt;range1&gt; &lt;range2&gt; | &lt;rev1&gt;&#8230;&#8203;&lt;rev2&gt; | &lt;base&gt; &lt;rev1&gt; &lt;rev2&gt; )
         [[--] &lt;path&gt;&#8230;&#8203;]</pre>
 </div>
@@ -549,6 +550,23 @@ <h2 id="_options">OPTIONS</h2>
 <p>Suppress commits that are missing from the second specified range
 (or the "right range" when using the <em>&lt;rev1&gt;</em><code>...</code><em>&lt;rev2&gt;</em> format).</p>
 </dd>
+<dt class="hdlist1">--diff-merges=&lt;format&gt;</dt>
+<dd>
+<p>Instead of ignoring merge commits, generate diffs for them using the
+corresponding <code>--diff-merges=</code><em>&lt;format&gt;</em> option of <a href="git-log.html">git-log(1)</a>,
+and include them in the comparison.</p>
+<div class="paragraph">
+<p>Note: In the common case, the <code>remerge</code> mode will be the most natural one
+to use, as it shows only the diff on top of what Git&#8217;s merge machinery would
+have produced. In other words, if a merge commit is the result of a
+non-conflicting <code>git</code> <code>merge</code>, the <code>remerge</code> mode will represent it with an empty
+diff.</p>
+</div>
+</dd>
+<dt class="hdlist1">--remerge-diff</dt>
+<dd>
+<p>Convenience option, equivalent to <code>--diff-merges=remerge</code>.</p>
+</dd>
 <dt class="hdlist1">--[no-]notes[=&lt;ref&gt;]</dt>
 <dd>
 <p>This flag is passed to the <code>git</code> <code>log</code> program
@@ -813,7 +831,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2023-10-29 16:42:00 -0700
+Last updated 2024-12-23 10:48:30 -0800
 </div>
 </div>
 </body>

git-range-diff.txt

@@ -10,7 +10,8 @@ SYNOPSIS
 [verse]
 'git range-diff' [--color=[<when>]] [--no-color] [<diff-options>]
 	[--no-dual-color] [--creation-factor=<factor>]
-	[--left-only | --right-only]
+	[--left-only | --right-only] [--diff-merges=<format>]
+	[--remerge-diff]
 	( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )
 	[[--] <path>...]
 
@@ -81,6 +82,20 @@ to revert to color all lines according to the outer diff markers
 	Suppress commits that are missing from the second specified range
 	(or the "right range" when using the `<rev1>...<rev2>` format).
 
+--diff-merges=<format>::
+	Instead of ignoring merge commits, generate diffs for them using the
+	corresponding `--diff-merges=<format>` option of linkgit:git-log[1],
+	and include them in the comparison.
++
+Note: In the common case, the `remerge` mode will be the most natural one
+to use, as it shows only the diff on top of what Git's merge machinery would
+have produced. In other words, if a merge commit is the result of a
+non-conflicting `git merge`, the `remerge` mode will represent it with an empty
+diff.
+
+--remerge-diff::
+	Convenience option, equivalent to `--diff-merges=remerge`.
+
 --[no-]notes[=<ref>]::
 	This flag is passed to the `git log` program
 	(see linkgit:git-log[1]) that generates the patches.

git-refs.html

@@ -541,9 +541,6 @@ <h2 id="_known_limitations">KNOWN LIMITATIONS</h2>
 <div class="ulist">
 <ul>
 <li>
-<p>It is not possible to migrate repositories that have reflogs.</p>
-</li>
-<li>
 <p>It is not possible to migrate repositories that have worktrees.</p>
 </li>
 <li>
@@ -571,7 +568,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-08-16 14:07:46 -0700
+Last updated 2024-12-23 10:48:30 -0800
 </div>
 </div>
 </body>

git-refs.txt

@@ -57,8 +57,6 @@ KNOWN LIMITATIONS
 
 The ref format migration has several known limitations in its current form:
 
-* It is not possible to migrate repositories that have reflogs.
-
 * It is not possible to migrate repositories that have worktrees.
 
 * There is no way to block concurrent writes to the repository during an