From: J. Bruce Fields Date: Mon, 19 Feb 2007 23:46:09 +0000 (-0500) Subject: user-manual: reset to ORIG_HEAD not HEAD to undo merge X-Git-Tag: v1.5.0.3~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1c73bb0ef7bf6632d1aa5d6760bba7ea4e336fe9;p=git.git user-manual: reset to ORIG_HEAD not HEAD to undo merge As Linus pointed out recently on the mailing list, git reset --hard HEAD^ doesn't undo a merge in the case where the merge did a fast-forward. So the rcommendation here is a little dangerous. Signed-off-by: "J. Bruce Fields" Signed-off-by: Junio C Hamano --- diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 7b6dc22e7..e37a1234f 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1255,7 +1255,7 @@ $ git reset --hard HEAD Or, if you've already commited the merge that you want to throw away, ------------------------------------------------- -$ git reset --hard HEAD^ +$ git reset --hard ORIG_HEAD ------------------------------------------------- However, this last command can be dangerous in some cases--never