Merge branch 'master' into gpg-ssh-fix

This commit is contained in:
Adam Goldsmith 2015-05-02 18:58:40 -04:00
commit 4e012e503e

View File

@ -10,17 +10,17 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
fi fi
# Package Management Aliases # Command Specific Aliases
if [ -f $HOME/.aliases.pkgman ] for i in $HOME/.aliases/command-specific/*
do
if hash $(basename $i) 2>/dev/null
then then
source $HOME/.aliases.pkgman source $i
fi fi
done
# Aliases # General Aliases
if [ -f $HOME/.aliases ] source $HOME/.aliases/general
then
source $HOME/.aliases
fi
# Various Options # Various Options
unsetopt share_history unsetopt share_history