fix recursive issue in git functions
Merge branch 'master' of github.com:rsb/dotfiles