Autogenerated HTML docs for v2.44.0-165-ge09f12

1 files changed, 8 insertions, 2 deletions

diff --git a/git-rev-list.html b/git-rev-list.html
index d17afc3b3..d8c4450cd 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1370,8 +1370,11 @@ See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div>
 </dt>

 <dd>

 <p>

-        After a failed merge, show refs that touch files having a

-        conflict and don&#8217;t exist on all heads to merge.

+        Show commits touching conflicted paths in the range <code>HEAD...&lt;other&gt;</code>,

+        where <code>&lt;other&gt;</code> is the first existing pseudoref in <code>MERGE_HEAD</code>,

+        <code>CHERRY_PICK_HEAD</code>, <code>REVERT_HEAD</code> or <code>REBASE_HEAD</code>. Only works

+        when the index has unmerged entries. This option can be used to show

+        relevant commits when resolving conflicts from a 3-way merge.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2238,6 +2241,9 @@ allow object traversal to continue for EXPECTED promisor missing objects.
 Unexpected missing objects will raise an error.</p></div>

 <div class="paragraph"><p>The form <em>--missing=print</em> is like <em>allow-any</em>, but will also print a

 list of the missing objects.  Object IDs are prefixed with a &#8220;?&#8221; character.</p></div>

+<div class="paragraph"><p>If some tips passed to the traversal are missing, they will be

+considered as missing too, and the traversal will ignore them. In case

+we cannot get their Object ID though, an error will be raised.</p></div>

 </dd>

 <dt class="hdlist1">

 --exclude-promisor-objects