Merge remote-tracking branch 'upstream/master'

This commit is contained in:
root 2015-10-05 01:10:02 +00:00
commit 8b45811f33

View file

@ -22,7 +22,7 @@ alias _='sudo'
alias please='sudo'
## more intelligent acking for ubuntu users
if which ack-grep > /dev/null;
if which ack-grep &> /dev/null;
then
alias afind='ack-grep -il'
else