"merge" branch reset in powerpc.git tree

[Arnd Bergmann]

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.

Then again, I'm pretty clueless about git as well.

	Arnd <><