a kind of magic
Today just a short tip: if you are using emacs and git, I can recommend magit.
Magit is a git-mode for emacs, which makes using git convenient and easy to use. Magit was created by running mate Marius. It's under heavy development, but I have been a happy user for while. There is even a user manual, which you actually don't need very much, as things work very much as you would expect.
If you are not using emacs, this might be a good reason to start.