d changes, reset is aborted.</p>
<div class="paragraph">
<p>In other words, <code>--merge</code> does something like a <code>git read-tree -u -m &lt;commit&gt;</code>,
but carries forward unmerged index entries.</p>
</div>
</dd>
<dt class="hdlist1">--keep</dt>
<dd>
<p>Resets index entries and updates files in the working tree that are
different between <code>&lt;commit&gt;</code> and <code>HEAD</code>.
If a file that is different between <code>&lt;commit&gt;</code> and <code>HEAD</code> has local
changes, r