Merge branch 'master' of github.com:joshtronic/dotfiles

This commit is contained in:
Josh Sherman 2018-03-06 17:04:08 -06:00
commit 5f09c3b663
No known key found for this signature in database
GPG key ID: 55B058A80530EF22

View file

@ -6,7 +6,12 @@ alias mv='mv -i'
alias rm='rm -i'
# Colorize output
alias ls='ls --color=auto'
if [[ `uname` == Darwin ]]; then
alias dircolors='gdircolors'
alias ls='gls --color=auto'
else
alias ls='ls --color=auto'
fi
# Colorize output and some exclusions
alias grep="grep --color=auto --exclude-dir={.git,artwork,node_modules,vendor}"