Merge 7092482c88 into 47b0d754ae

lib/aliases.zsh

@@ -1,11 +1,3 @@
-# Push and pop directories on directory stack
-alias pu='pushd'
-alias po='popd'
-
-# Basic directory operations
-alias ...='cd ../..'
-alias -- -='cd -'
-
 # Prevent headaches
 alias cp='cp -v'
 alias rm='rm -v'
@@ -15,8 +7,6 @@ alias mv='mv -v'
 alias _='sudo'
 alias please='sudo'
 
-#alias g='grep -in'
-
 # Show history
 if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
 then
@@ -38,4 +28,3 @@ alias la='ls -lAh'
 alias sl=ls # often screw this up
 
 alias afind='ack-grep -il'
-

lib/directories.zsh

@@ -4,7 +4,13 @@ setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus
 
+# Push and pop directories on directory stack
+alias pu='pushd'
+alias po='popd'
+
+# Basic directory operations
 alias ..='cd ..'
+alias ...='cd ../..'
 alias cd..='cd ..'
 alias cd...='cd ../..'
 alias cd....='cd ../../..'
@@ -20,6 +26,11 @@ alias 6='cd -6'
 alias 7='cd -7'
 alias 8='cd -8'
 alias 9='cd -9'
+alias -- -='cd -'
+
+alias md='mkdir -p'
+alias rd=rmdir
+alias d='dirs -v | head -10'
 
 cd () {
   if   [[ "x$*" == "x..." ]]; then
@@ -37,7 +48,3 @@ cd () {
     builtin cd "$@"
   fi
 }
-
-alias md='mkdir -p'
-alias rd=rmdir
-alias d='dirs -v | head -10'