diff options
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/git-merge.html b/git-merge.html index aff0c4819..70dd8fdb4 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1154,8 +1154,13 @@ will be appended to the specified message.</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">
@@ -2316,7 +2321,7 @@ branch.<name>.mergeOptions <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>
|