add aliases from

https://ochronus.com/git-tips-from-the-trenches/
Merge branch 'master' of github.com:kian/dotfiles