            <b class="conum">(7)</b>
$ git commit ...                            <b class="conum">(8)</b></pre>
</div>
</div>
<div class="colist arabic">
<ol>
<li>
<p>First, reset the history back one commit so that we remove the original
commit, but leave the working tree with all the changes. The -N ensures
that any new files added with <code>HEAD</code> are still marked so that <code>git add -p</code>
will find them.</p>
</li>
<li>
<p>Next, we interactively select diff hunks to add using the <code>git ad