From: Morten Welinder <mwelinder@gmail.com>
Date: Sat, 17 Dec 2005 00:37:18 GMT
Subject: Re: bad git pull
Message-ID: <118833cc0512161637v1d180f9fh66a7dc6d3fe11d2b@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0512161347490.3698@g5.osdl.org>

>  - undo the last commit entirely ("hard reset to previous state"):
>
>         git reset --hard HEAD^
>
>    This was "bk undo"
>
>  - undo the last pull ("bk unpull"): "hard reset to ORIG_HEAD":
>
>         git reset --hard ORIG_HEAD
>
>    This was "bk unpull".

It would be outright peachy if Documentation/git-commit.txt and
Documentation/git-pull.txt mentioned these.  That is certainly
where I would look first to answer the "what if I screwed up?"
question.

Morten