Re: master branch reset

[Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>]

On Tue, 5 Dec 2006, Grant Likely wrote:
> On 12/5/06, Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> wrote:
> > On Tue, 5 Dec 2006, Grant Likely wrote:
> > > On 12/5/06, Geert Uytterhoeven <Geert.Uytterhoeven@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.

Apparently not :-(

| pademelon$ git-reset --hard origin
| pademelon$ git pull -v
| Unpacking 10843 objects
|  100% (10843/10843) done
| * committish: ef6a3165e75c189da82c943a081cd1da52068738
|   branch 'for-2.6.20' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * refs/heads/for-2.6.20: same as branch 'for-2.6.20' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * committish: e62438630ca37539c8cc1553710bbfaa3cf960a7
|   branch 'master' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
| * refs/heads/origin: does not fast forward to branch 'master' of git://www.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc;
|   not updating.
| pademelon$

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium