From: Brent Goodrick <bgoodr@gmail.com>
Date: Tue, 24 Feb 2009 05:37:38 GMT
Subject: Re: How do I undo a fast-forward merge safely?
Message-ID: <e38bce640902232137s622410cv4506b8e0083bb468@mail.gmail.com>
In-Reply-To: <m3fxi6s0vu.fsf@localhost.localdomain>

On Sun, Feb 22, 2009 at 11:54 AM, Jakub Narebski <jnareb@gmail.com> wrote:
> > So, what operations, rebase, reset, etc, do I need to do to get this
> > repo back to where it was right before the fast-forward?
>
> Each 'large' operation sets ORIG_HEAD
>
>  $ git reset --hard ORIG_HEAD
>

Thanks Jakub. "git reset --hard ORIG_HEAD" was what I went with and it
worked like a charm!

bg