Autogenerated HTML docs for v2.37.2-382-g795ea

1 files changed, 8 insertions, 3 deletions

diff --git a/git-am.html b/git-am.html
index 8f339034d..80551be05 100644
--- a/git-am.html
+++ b/git-am.html
@@ -957,8 +957,13 @@ default.   You can use <code>--no-utf8</code> to override this.</p></div>
 </dt>

 <dd>

 <p>

-        Allow the rerere mechanism to update the index with the

-        result of auto-conflict resolution if possible.

+        After the rerere mechanism reuses a recorded resolution on

+        the current conflict to update the files in the working

+        tree, allow it to also update the index with the result of

+        resolution.  <code>--no-rerere-autoupdate</code> is a good way to

+        double-check what <code>rerere</code> did and catch potential

+        mismerges, before committing the result to the index with a

+        separate <code>git add</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1233,7 +1238,7 @@ information.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-01-05 14:13:29 PST

+ 2022-08-18 14:11:07 PDT

 </div>

 </div>

 </body>