Andy Parkins wrote: > On Thursday 2006, December 14 21:58, Junio C Hamano wrote: > >> Correct but a bad example that does not demonstrate the real >> power of reflog. Andy's AGGGHHHHHH can be recovered with a >> simple: >> >> $ git reset ORIG_HEAD > > HAHA! I knew reading this mailing list would pay off. > > It amazes me that there is always an answer. It's almost becoming a > pantomime - I say "well git can't do this", and you say "oh yes it can". And it is mentioned in git-reset(1), although: * it would be nice to have example with ORIG_HEAD about how to recover from bad (wrong) git reset in EXAMPLES section. * it would be nice to mention that the first example can be now done with simply "edit; git commit -a --amend" instead of "git reset --soft HEAD^; edit; git commit -a -c ORIG_HEAD" (which can fail for merges). -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html