new stuff for git

from http://nuclearsquid.com/writings/git-tricks-tips-workflows/