master branch reset

[Grant Likely]

On 12/5/06, Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com> wrote:
> On Tue, 5 Dec 2006, Grant Likely wrote:
> > On 12/5/06, Geert Uytterhoeven <Geert.Uytterhoeven at sonycom.com> wrote:
> > > On Mon, 4 Dec 2006, Paul Mackerras wrote:
> >
> > > Any clues? Delete and reclone?
> >
> > Because Paul had to redo his tree; you're no longer able to 'pull' his
> > changes into your branch.  If you've got changes that you need to
> > preserve; then you need to either generate a diff between Paul's old
> > HEAD and your HEAD; then apply that to a new branch based of Paul's
> > new HEAD.
> >
> > Or; you can create a new branch based on the new HEAD and
> > 'git-cherry-pick' your changes into it.
> >
> > Either way, it can be rather painful.
>
> I didn't make any local changes, so I assumed I could just follow Paul's
> instructions. But they failed.

You're in easy street then; assuming you just cloned from powerpc.git, just do:

git-reset --hard origin

and your done.

g.

-- 
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely at secretlab.ca
(403) 399-0195