rename log-aliases and add one to show --all branches
fix alias bug
Merge branch 'master' into solarized-default