index 2af472a5691007296ffb3a3c0921ab27e23e3884..0a7365b9a80ed0d134bccb3fbe4baacc59056423 100644 (file)
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