From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Nov 2010 17:58:41 GMT
Subject: Re: How to recover a lost commit...
Message-ID: <7vfwv7hhda.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTikqBXjAf44O0QERH39rK+7nNA8uD2CwtPKJTTyV@mail.gmail.com>

Patrick Doyle <wpdster@gmail.com> writes:

> $ git merge --no-commit
> $ git reset
>
> Why is that "git reset" benign, when the "git reset HEAD^" wasn't benign before?

The former is resetting the index to HEAD (your latest commit), while the
latter is resetting the index to HEAD^ (the one before that, discarding
your latest commit), no?