orking tree. Any changes to tracked files in the
working tree since <code>&lt;commit&gt;</code> are discarded.</p>
</dd>
<dt class="hdlist1">--merge</dt>
<dd>
<p>Resets the index and updates the files in the working tree that are
different between <code>&lt;commit&gt;</code> and <code>HEAD</code>, but keeps those which are
different between the index and working tree (i.e. which have changes
which have not been added).
If a file that is different between <code>&lt;commit&gt;</code> and the index has
unstage