@@ -2,8 +2,14 @@ alias pu='pushd'

 alias po='popd'

 alias sc='ruby script/console'

+alias sdb='ruby script/dbconsole'

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

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

+alias sg='ruby script/generate'

+alias sd='ruby script/destroy'

+alias sp='ruby script/plugin'

+alias ssp='ruby script/spec'

+alias rdbm='rake db:migrate'

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

 alias .='pwd'

@@ -18,6 +24,7 @@ alias ss='sudo su -'

 alias g='git'

 alias gst='git status'

 alias gl='git pull'

+alias gup='git fetch && git rebase'

 alias gp='git push'

 alias gd='git diff | mate'

 alias gdv='git diff -w "$@" | vim -R -'

@@ -25,6 +32,8 @@ alias gc='git commit -v'

 alias gca='git commit -v -a'

 alias gb='git branch'

 alias gba='git branch -a'

+alias gdb='git branch -d'

+alias gcount='git shortlog -sn'

 alias history='fc -l 1'