diff options
Diffstat (limited to 'git-cherry-pick.html')
| -rw-r--r-- | git-cherry-pick.html | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 15451e184..2fbd7af8a 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -1018,8 +1018,13 @@ effect to your index in a row.</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>
</dl></div>
@@ -1212,7 +1217,7 @@ try to apply the change introduced by <code>topic^</code> again, <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-10 14:52:02 PST
+ 2022-08-18 14:11:07 PDT
</div>
</div>
</body>
|