</p>
</div>
<div class="listingblock">
<div class="content">
<pre>$ git reset -N HEAD^                        <b class="conum">(1)</b>
$ git add -p                                <b class="conum">(2)</b>
$ git diff --cached                         <b class="conum">(3)</b>
$ git commit -c HEAD@{1}                    <b class="conum">(4)</b>
...                                         <b class="conum">(5)</b>
$ git add ...                               <b class="conum">(6)</b>
$ git diff --cached             