Merge remote-tracking branch 'robbyrussell/master'

Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/directories.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/termsupport.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Shawn Sorichetti 2011-05-02 15:32:24 -04:00
commit a1a75be21d
70 changed files with 1930 additions and 105 deletions

View file

@ -3,11 +3,7 @@ setopt auto_name_dirs
setopt auto_pushd
setopt pushd_ignore_dups
alias -- -='cd -'
alias ..='cd ..'
alias ...='cd ../..'
alias ....='cd ../../..'
alias .....='cd ../../../..'
alias cd..='cd ..'
alias cd...='cd ../..'
alias cd....='cd ../../..'
@ -30,9 +26,13 @@ cd () {
alias md='mkdir -p'
alias rd=rmdir
alias d='dirs -v'
# mkdir & cd to it
function mcd() {
mkdir -p "$1" && cd "$1";
}alias d='dirs -v'
# List direcory contents
alias l1='tree --dirsfirst -ChFL 1'
alias l2='tree --dirsfirst -ChFL 2'