"merge" branch reset in powerpc.git tree

[Josh Boyer]

On Fri, 2006-06-23 at 21:24 +0200, Arnd Bergmann wrote:
> On Friday 23 June 2006 21:10, Josh Boyer wrote:
> > 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.
> > 
> My understanding is that you are not supposed to have local changes
> on the branch you are pulling into, but have another branch for
> merging the remote tree with your own changes.

True.  But there is nothing to prevent people from doing it.  So I was
just warning them :).

josh