Merge branch 'master' into gpg-ssh-fix
This commit is contained in:
commit
4e012e503e
@ -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/*
|
||||||
then
|
do
|
||||||
source $HOME/.aliases.pkgman
|
if hash $(basename $i) 2>/dev/null
|
||||||
fi
|
then
|
||||||
|
source $i
|
||||||
|
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
|
||||||
|
Reference in New Issue
Block a user