Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2013-12-03 09:41:48 +01:00
commit 24f2838f0b
54 changed files with 1539 additions and 178 deletions

View file

@ -21,7 +21,18 @@ alias please='sudo'
#alias g='grep -in'
# Show history
alias history='fc -l 1'
if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
then
alias history='fc -fl 1'
elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ]
then
alias history='fc -El 1'
elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ]
then
alias history='fc -il 1'
else
alias history='fc -l 1'
fi
# Enable ls colors
LS_OPTIONS='-hF'