From: Linus Torvalds <torvalds@osdl.org>
Date: Tue, 10 Jan 2006 19:45:23 GMT
Subject: Re: git-bisect is magical
Message-ID: <Pine.LNX.4.64.0601101143180.4939@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0601101131540.4939@g5.osdl.org>



On Tue, 10 Jan 2006, Linus Torvalds wrote:
> 
> You can _undo_ the revert, so it's not permanent in that sense. Just do
> 
> 	git reset --hard origin
> 
> and your "master" branch will be forced back to the state that "origin" 
> was in.

Btw, you can try this (careful - it will also undo any dirty state you 
have in your working tree), and then do the "pull" again (which should now 
be a trivial fast-forward) and then just try to do the "git revert" on the 
new state.

An even better option is obviously to figure out _why_ that commit broke 
for you in the first place, and get it fixed up-stream, so that you don't 
even need to revert it any more, and the "pull" just fixes it for you ;)

			Linus