Autogenerated HTML docs for v2.49.0-rc0-57-gdb9195

Author: gitster

RelNotes/2.49.0.adoc

@@ -49,6 +49,9 @@ UI, Workflows & Features
  * Removal of ".git/branches" and ".git/remotes" support in the
    BreakingChanges document has been further clarified.
 
+ * What happens to submodules during merge has been documented in a
+   bit more detail.
+
 
 Performance, Internal Implementation, Development Support etc.
 --------------------------------------------------------------
@@ -57,6 +60,9 @@ Performance, Internal Implementation, Development Support etc.
 
  * meson-based build now supports the unsafe-sha1 build knob.
 
+ * The meson-based build procedure covers contrib/ and other places as
+   well.
+
  * The code to check LSan results has been simplified and made more
    robust.
    (merge 164a2516eb jk/lsan-race-ignore-false-positive later to maint).
@@ -84,6 +90,9 @@ Performance, Internal Implementation, Development Support etc.
 
  * "git difftool" code clean-up.
 
+ * Rename processing in the recursive merge backend has seen a micro
+   optimization.
+
 
 Fixes since v2.48
 -----------------
@@ -241,6 +250,10 @@ Fixes since v2.48
    been fast-forwarded.
    (merge af8fc7be10 pw/rebase-i-ff-empty-commit later to maint).
 
+ * The use of "paste" command for aggregating the test results have
+   been corrected.
+   (merge ce98863204 dk/test-aggregate-results-paste-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge ddb5287894 jk/t7407-use-test-grep later to maint).
    (merge 21e1b44865 aj/difftool-config-doc-fix later to maint).

git-merge.html

@@ -1181,6 +1181,14 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 was written as a replacement for the previous default
 algorithm, <code>recursive</code>.</p>
 <div class="paragraph">
+<p>In the case where the path is a submodule, if the submodule commit used on
+one side of the merge is a descendant of the submodule commit used on the
+other side of the merge, Git attempts to fast-forward to the
+descendant. Otherwise, Git will treat this case as a conflict, suggesting
+as a resolution a submodule commit that is descendant of the conflicting
+ones, if one exists.</p>
+</div>
+<div class="paragraph">
 <p>The <em>ort</em> strategy can take the following options:</p>
 </div>
 <div class="dlist">
@@ -1279,6 +1287,10 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 the default strategy for resolving two heads from Git v0.99.9k
 until v2.33.0.</p>
 <div class="paragraph">
+<p>For a path that is a submodule, the same caution as <em>ort</em> applies to this
+strategy.</p>
+</div>
+<div class="paragraph">
 <p>The <em>recursive</em> strategy takes the same options as <em>ort</em>.  However,
 there are three additional options that <em>ort</em> ignores (not documented
 above) that are potentially useful with the <em>recursive</em> strategy:</p>

git-pull.html

@@ -1512,6 +1512,14 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 was written as a replacement for the previous default
 algorithm, <code>recursive</code>.</p>
 <div class="paragraph">
+<p>In the case where the path is a submodule, if the submodule commit used on
+one side of the merge is a descendant of the submodule commit used on the
+other side of the merge, Git attempts to fast-forward to the
+descendant. Otherwise, Git will treat this case as a conflict, suggesting
+as a resolution a submodule commit that is descendant of the conflicting
+ones, if one exists.</p>
+</div>
+<div class="paragraph">
 <p>The <em>ort</em> strategy can take the following options:</p>
 </div>
 <div class="dlist">
@@ -1610,6 +1618,10 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 the default strategy for resolving two heads from Git v0.99.9k
 until v2.33.0.</p>
 <div class="paragraph">
+<p>For a path that is a submodule, the same caution as <em>ort</em> applies to this
+strategy.</p>
+</div>
+<div class="paragraph">
 <p>The <em>recursive</em> strategy takes the same options as <em>ort</em>.  However,
 there are three additional options that <em>ort</em> ignores (not documented
 above) that are potentially useful with the <em>recursive</em> strategy:</p>

git-rebase.html

@@ -1569,6 +1569,14 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 was written as a replacement for the previous default
 algorithm, <code>recursive</code>.</p>
 <div class="paragraph">
+<p>In the case where the path is a submodule, if the submodule commit used on
+one side of the merge is a descendant of the submodule commit used on the
+other side of the merge, Git attempts to fast-forward to the
+descendant. Otherwise, Git will treat this case as a conflict, suggesting
+as a resolution a submodule commit that is descendant of the conflicting
+ones, if one exists.</p>
+</div>
+<div class="paragraph">
 <p>The <em>ort</em> strategy can take the following options:</p>
 </div>
 <div class="dlist">
@@ -1667,6 +1675,10 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
 the default strategy for resolving two heads from Git v0.99.9k
 until v2.33.0.</p>
 <div class="paragraph">
+<p>For a path that is a submodule, the same caution as <em>ort</em> applies to this
+strategy.</p>
+</div>
+<div class="paragraph">
 <p>The <em>recursive</em> strategy takes the same options as <em>ort</em>.  However,
 there are three additional options that <em>ort</em> ignores (not documented
 above) that are potentially useful with the <em>recursive</em> strategy:</p>

merge-strategies.adoc

@@ -22,6 +22,13 @@ ort::
 	was written as a replacement for the previous default
 	algorithm, `recursive`.
 +
+In the case where the path is a submodule, if the submodule commit used on
+one side of the merge is a descendant of the submodule commit used on the
+other side of the merge, Git attempts to fast-forward to the
+descendant. Otherwise, Git will treat this case as a conflict, suggesting
+as a resolution a submodule commit that is descendant of the conflicting
+ones, if one exists.
++
 The 'ort' strategy can take the following options:
 
 ours;;
@@ -96,6 +103,9 @@ recursive::
 	the default strategy for resolving two heads from Git v0.99.9k
 	until v2.33.0.
 +
+For a path that is a submodule, the same caution as 'ort' applies to this
+strategy.
++
 The 'recursive' strategy takes the same options as 'ort'.  However,
 there are three additional options that 'ort' ignores (not documented
 above) that are potentially useful with the 'recursive' strategy: