Merge remote-tracking branch 'cadusk/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-10-07 11:53:12 +02:00
commit cf1c065d71
5 changed files with 54 additions and 16 deletions

View file

@ -50,11 +50,4 @@ alias l='ls -lah'
alias ll='ls -lh'
alias la='ls -lAh'
alias gita='git add -A'
alias gitl='git l'
alias gitw='git who'
alias gitt='git tags'
# Aliases
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
alias afind='ack-grep -il'