Merge remote-tracking branch 'sjl/master'

Conflicts:
	.gitignore
	lib/directories.zsh
	lib/functions.zsh
	lib/git.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Shawn Sorichetti 2011-06-03 16:56:06 -04:00
commit 2f046e7e4a
9 changed files with 36 additions and 64 deletions

View file

@ -28,13 +28,6 @@ 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'
@ -46,3 +39,8 @@ alias ll3='tree --dirsfirst -ChFupDaL 3'
alias l='l1'
alias ll='ll1'
# mkdir & cd to it
function mcd() {
mkdir -p "$1" && cd "$1";
}