use --oneline instead of "--pretty=oneline --abbrev-commit"

add --decorate
clean up
Merge branch 'master' of github.com:xatier/rc-files