Krzysztof Kosiński scrisse:

Does anyone know some short tutorial on Git that shows how to work with multiple branches that come from different repositories? I'm forced to work with it if I want to do anything with Cairo and Pixman.

I think that everything you need as a primer to work with third-party branches and remotes is here: * http://progit.org/book/ch2-5.html * http://help.github.com/remotes/

I'm not really sure what's your workflow, but you may be interested in submodules: * http://progit.org/book/ch6-6.html

I generally tend not to use them, as they're mostly useful if you need to commit back changes to external modules.

[rant] Coming from an SVN / Bazaar background I find Git impenetrable, and some design decisions are crazy. (For example, "silently commit successful merges" and "revision numbers are for wimps".)

Sometimes that's true. You may want to inspect the --no-ff/--no-commit options for your workflow (and if satisfied, customize your .gitconfig). Also, depending on the workflow, with revision numbers you can get in situation like our "Houston, where are our revisions?": http://article.gmane.org/gmane.comp.graphics.inkscape.devel/32632 IIRC, even in bazaar revision are calculated only at frontend-time, core knows nothing about them to avoid troubles.

Cheers, Luca