$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
- $ git commit -c ORIG_HEAD
+ $ git commit -c ORIG_HEAD
+
From: Junio C Hamano
$ git reset --soft HEAD^
$ ... do something else to come up with the right tree ...
- $ git commit -c ORIG_HEAD
+ $ git commit -c ORIG_HEAD
+
but can be used to amend a merge commit.
@@ -506,7 +507,7 @@ Junio C Hamano <junkio@cox.net>