"merge" branch reset in powerpc.git tree

[Josh Boyer]

On Fri, 2006-06-23 at 11:48 -0500, Dave C Boutcher wrote:
> On Fri, 23 Jun 2006 21:44:58 +1000, Paul Mackerras <paulus at samba.org> said:
> > 
> > If you are following the powerpc.git tree, and you pull the "merge"
> > branch, you will need to reset it to have commit ID
> > 5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head.  That's also the
> > head of the "master" branch and of Linus' linux-2.6 tree at the
> > moment.
> 
> At risk of appearing like a git ignoramous...could you post the
> command to perform such a reset?

Run the following in that branch:

git reset --hard 5fa21d821f6972e70942f2c555ec29dde962bdb2

That will reset the branch to the commit ID.  NOTE:  If you have local
changes on top, they will be wiped out.

There might be a way to do it without losing local changes, but I'm a
git idiot myself still.

josh