[cairo] Re: [cairo-commit] src/cairo-png.c

[Peter Weilbacher (Mozilla)]

Behdad Esfahbod wrote:
> On Mon, 2007-04-23 at 23:32 +0200, Peter Weilbacher (Mozilla) wrote:
>> Bloody hell! I pushed it like I always did the OS/2 stuff but something
>> must have gone completely wrong, because what I did seems to have
>> reverted some of the earlier changes. Not sure what happened, but now
>> I need help from somebody to clean up the mess.
> 
> It's all fine,

I'm relieved to hear that.

> it's just that you marged an old branch instead of
> rebasing it to the latest master.  Just use git-rebase and things look a
> lot nicer.

That's what I have done, following the guide from the freedesktop wiki.
I guess I have to set up a local repository to play with to understand
the intricacies of git, before I try the next push...

   Peter.