From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 04 Dec 2008 02:03:15 GMT
Subject: Re: Add 'sane' mode to 'git reset'
Message-ID: <7vk5ag7l3w.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LFD.2.00.0812031634520.3256@nehalem.linux-foundation.org>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> On Wed, 3 Dec 2008, Junio C Hamano wrote:
>> 
>> The recovery procedure I would use in such a case (and I rarely pull while
>> managing git.git even though I do so in my day job) would be:
>> 
>> 	$ git checkout -b this-needs-more-work
>>      $ git checkout master
>
> No, that won't work. The second 'git checkout' does nothing, since 
> 'master' still has all the broken code in it.

Yeah, brain-o.  I should have said

	git checkout -b needs-more-work
        git branch -f master master~$n
        git checkout master

or something like that.