788c9af05684f4b9e39e7f15de2c06c4c8291cbd

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index 5f3582bd87ded89eb676f16618e4f43e74c48143..273bcc6792c726102476e5be6d139f4e54ffbe78 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -2,8 +2,14 @@ alias pu='pushd'
 6 alias po='popd'
 7 
 8 alias sc='ruby script/console'
 9+alias sdb='ruby script/dbconsole'
10 alias sd='ruby script/server --debugger'
11 alias ss='thin --stats "/thin/stats" start'
12+alias sg='ruby script/generate'
13+alias sd='ruby script/destroy'
14+alias sp='ruby script/plugin'
15+alias ssp='ruby script/spec'
16+alias rdbm='rake db:migrate'
17 
18 alias mr='mate CHANGELOG app config db lib public script spec test'
19 alias .='pwd'
20@@ -18,6 +24,7 @@ alias ss='sudo su -'
21 alias g='git'
22 alias gst='git status'
23 alias gl='git pull'
24+alias gup='git fetch && git rebase'
25 alias gp='git push'
26 alias gd='git diff | mate'
27 alias gdv='git diff -w "$@" | vim -R -'
28@@ -25,6 +32,8 @@ alias gc='git commit -v'
29 alias gca='git commit -v -a'
30 alias gb='git branch'
31 alias gba='git branch -a'
32+alias gdb='git branch -d'
33+alias gcount='git shortlog -sn'
34 
35 alias history='fc -l 1'
36