Linus Torvalds [off-list ref] writes:
On Wed, 3 Dec 2008, Junio C Hamano wrote:
quoted
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.