sorry, I messed in the git tree

[David Woodhouse]

On Tue, 2007-12-04 at 08:02 +0100, Holger Schurig wrote:
> Hi David !
> 
> Sorry, I messed in the git tree. "git push" is new to me and it 
> was too early. Err, no. The problem was between keyboard and 
> screen ...

Heh, no problem. For reference, you can clean up locally and then use
'git-push -f' to force a non-fast-forward push. I've just done that.

Since we were playing silly buggers anyway, I took the opportunity to
rebase to 2.6.24-rc3. I wouldn't normally have done that (normally I'd
have just pulled; rebasing is evil), but there are some commits which
were committed independently in Linus' tree which we also had, so I
wanted to eliminate the duplicates. 

I didn't _need_ to -- git is perfectly capable of handling merges where
the same thing has been committed twice -- but since we were mucking
about with it, I figured I might as well clean it up.

-- 
dwmw2