summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/aliases.zsh14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 6f6c614f7..304bafd27 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -2,8 +2,14 @@ alias pu='pushd'
alias po='popd'
alias sc='ruby script/console'
-alias sd='ruby script/server --debugger'
+alias sdb='ruby script/dbconsole'
+alias ssd='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,12 +24,17 @@ 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 -'
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 gcp='git cherry-pick'
alias history='fc -l 1'
@@ -36,6 +47,7 @@ alias sl=ls # often screw this up
alias sgem='sudo gem'
alias rfind='find . -name *.rb | xargs grep -n'
+alias afind='ack-grep -il'
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'