summaryrefslogtreecommitdiff
path: root/builtin-fsck.c
diff options
context:
space:
mode:
authorLibravatar J. Bruce Fields <bfields@citi.umich.edu>2007-02-19 18:46:09 -0500
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-04 16:47:32 -0800
commit1c73bb0ef7bf6632d1aa5d6760bba7ea4e336fe9 (patch)
treea71aed30534255232eb7f53d1d00ea28556c9887 /builtin-fsck.c
parentDocumentation: mention module option to git-cvsimport (diff)
downloadtgif-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>
Diffstat (limited to 'builtin-fsck.c')
0 files changed, 0 insertions, 0 deletions