Git Magic

If you ever run into trouble trying to do something that should be really easy with git but doesn't seem to be, if you want to learn git or think you already know everything important about it, and in many other cases, this article about git is a must read:

http://www-cs-students.stanford.edu/~blynn/gitmagic/