<div class="content">\r
<pre><tt> $ git reset --soft HEAD^\r
$ ... do something else to come up with the right tree ...\r
- $ git commit -c ORIG_HEAD</tt></pre>\r
+ $ git commit -c ORIG_HEAD\r
+</tt></pre>\r
</div></div>\r
<p>but can be used to amend a merge commit.</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Apr-2006 21:43:17 UTC\r
+Last updated 05-Apr-2006 23:07:59 UTC\r
</div>\r
</div>\r
</body>\r
the current tip as parents -- so the current top commit is
discarded.
+
+--
It is a rough equivalent for:
-+
-------------
+------
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
$ git commit -c ORIG_HEAD
-------------
-+
+
+------
but can be used to amend a merge commit.
+--
-i|--include::
Instead of committing only the files specified on the