Re: Git repo commits re-done?

On 25/10/11 13:21, Arran Cudbard-Bell wrote:

Simple way:

git checkout master git reset --hard c45d143ca34064677d5212697cf061270e031262 git pull

You probably did a git pull between a rebase. Alan's fault not yours ;)

Ah I was wondering.

With the above you'll lose any local commits on master that haven't been pulled upstream.

I also had to "git push --force" to get the remote to rewind. Presumably this will also break any branches I made off my (old) master, but since they're all tiny 1-patch branches, I don't think I care.