@@ -1,19 +1,23 @@

+#!/bin/zsh

+

+# Push and pop directories on directory stack

 alias pu='pushd'

 alias po='popd'

-alias sc='ruby script/console'

-alias sd='ruby script/server --debugger'

+# Ruby related

 alias ss='thin --stats "/thin/stats" start'

-alias mr='mate CHANGELOG app config db lib public script spec test'

+# Basic directory operations

 alias .='pwd'

 alias ...='cd ../..'

+# Super user

 alias _='sudo'

 alias ss='sudo su -'

 #alias g='grep -in'

+# Git related

 alias g='git'

 alias gst='git status'

 alias gl='git pull'

@@ -24,24 +28,36 @@ alias gca='git commit -v -a'

 alias gb='git branch'

 alias gba='git branch -a'

+# Show history

 alias history='fc -l 1'

-alias ls='ls -F'

+# List direcory contents

+#alias ls='ls -F' # This messes up colors on my linux system

+alias l='ls -la'

 alias ll='ls -alr'

-alias l='ls'

-alias ll='ls -l'

 alias sl=ls # often screw this up

 alias sgem='sudo gem'

+# Find ruby file

 alias rfind='find . -name *.rb | xargs grep -n'

+# Git and svn mix

 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

+# TextMate

 alias et='mate . &'

 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'

 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'

+## Ruby related

+# Ruby scripts

+alias sc='ruby script/console'

+alias sd='ruby script/server --debugger'

+

+# Editor Ruby file in TextMate

+alias mr='mate CHANGELOG app config db lib public script spec test'

+

@@ -14,7 +14,7 @@ compinit

 zmodload -i zsh/complist

 ## case-insensitive (all),partial-word and then substring completion

-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

+#zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

 zstyle ':completion:*' list-colors ''

 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )

@@ -32,8 +32,7 @@ zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-

 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"

 zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`

-

-#complete on history

+# Complete on history

 # zstyle ':completion:*:history-words' stop yes

 # zstyle ':completion:*:history-words' remove-all-dups yes

 # zstyle ':completion:*:history-words' list false