Autogenerated HTML docs for v2.31.1-305-gd1b10

1 files changed, 7 insertions, 6 deletions

diff --git a/git-apply.html b/git-apply.html
index aa10073ae..f7a3cd87a 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -876,12 +876,13 @@ and does not require them to be in a Git repository.</p></div>
 </dt>

 <dd>

 <p>

-        When the patch does not apply cleanly, fall back on 3-way merge if

-        the patch records the identity of blobs it is supposed to apply to,

-        and we have those blobs available locally, possibly leaving the

+        Attempt 3-way merge if the patch records the identity of blobs it is supposed

+        to apply to and we have those blobs available locally, possibly leaving the

         conflict markers in the files in the working tree for the user to

-        resolve.  This option implies the <code>--index</code> option, and is incompatible

-        with the <code>--reject</code> and the <code>--cached</code> options.

+        resolve.  This option implies the <code>--index</code> option unless the

+        <code>--cached</code> option is used, and is incompatible with the <code>--reject</code> option.

+        When used with the <code>--cached</code> option, any conflicts are left at higher stages

+        in the cache.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1220,7 +1221,7 @@ subdirectory is checked and (if possible) updated.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:12:31 PDT

+ 2021-04-15 14:08:03 PDT

 </div>

 </div>

 </body>