Bernt Hansen <be...@norang.ca> wrote: > Assuming his has local commits buried in his history somewhere Tom can > 'fix' it by doing > > $ git checkout master > $ git reset --hard origin/master > $ git cherry-pick <whatever local commits he wants to keep> > > so the new commits are on top of origin/master, and set his master > branch to automatically rebase on pulls as described in the link above. >
Yup, now that you mention it, I think the first two steps is how I recovered (I try to keep a pristine master and do local work in branches, but I must have goofed up my master branch in that instance). Thanks, Nick
