diff options
| author |  J. Bruce Fields <bfields@citi.umich.edu> | 2007-02-19 18:46:09 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-03-04 16:47:32 -0800 |
| commit | 1c73bb0ef7bf6632d1aa5d6760bba7ea4e336fe9 (patch) | |
| tree | a71aed30534255232eb7f53d1d00ea28556c9887 | |
| parent | Documentation: mention module option to git-cvsimport (diff) | |
| download | tgif-1c73bb0ef7bf6632d1aa5d6760bba7ea4e336fe9.tar.xz | |
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>
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 7b6dc22e7b..e37a1234fa 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 |