![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | J. Bruce Fields <bfields@citi.umich.edu> | |
| Mon, 19 Feb 2007 23:46:09 +0000 (18:46 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 5 Mar 2007 00:47:32 +0000 (16:47 -0800) | ||
| commit | 1c73bb0ef7bf6632d1aa5d6760bba7ea4e336fe9 | |
| tree | a71aed30534255232eb7f53d1d00ea28556c9887 | tree | snapshot |
| parent | 0bc25a78428a7dc3a3acf00eb9637424419c3afd | commit | diff |
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" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/user-manual.txt | diff | blob | history |