diff options
| author | Toon Claes <toon@tonotdo.com> | 2009-10-16 22:14:43 +0200 |
|---|---|---|
| committer | Toon Claes <toon@tonotdo.com> | 2009-10-16 22:14:43 +0200 |
| commit | a75d0ba8d7b256fa2c21b0c8f04cbcab6b9289f2 (patch) | |
| tree | f3f2896b770b9eb516fb3fe19af2b82bc8fff054 /lib | |
| parent | 11d0b3c2ac271f8d87629c73c9832f135558a6a2 (diff) | |
| parent | c03aab51645fa7448f4e92b09ab00e2de989010e (diff) | |
| download | zsh-a75d0ba8d7b256fa2c21b0c8f04cbcab6b9289f2.tar.gz zsh-a75d0ba8d7b256fa2c21b0c8f04cbcab6b9289f2.tar.bz2 zsh-a75d0ba8d7b256fa2c21b0c8f04cbcab6b9289f2.zip | |
Fixing merge
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aliases.zsh | 15 | ||||
| -rw-r--r-- | lib/misc.zsh | 8 |
2 files changed, 12 insertions, 11 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index da6168506..9e2087728 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -4,12 +4,17 @@ alias pu='pushd' alias po='popd' -# Ruby related 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' # Basic directory operations alias .='pwd' alias ...='cd ../..' +alias -- -='cd -' # Super user alias _='sudo' @@ -21,12 +26,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' # Show history alias history='fc -l 1' @@ -41,6 +51,7 @@ alias sgem='sudo gem' # Find ruby file alias rfind='find . -name *.rb | xargs grep -n' +alias afind='ack-grep -il' # Git and svn mix alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' @@ -59,5 +70,3 @@ alias sd='ruby script/server --debugger' # Editor Ruby file in TextMate alias mr='mate CHANGELOG app config db lib public script spec test' - - diff --git a/lib/misc.zsh b/lib/misc.zsh index 8d6727251..a01627d9e 100644 --- a/lib/misc.zsh +++ b/lib/misc.zsh @@ -7,11 +7,3 @@ bindkey "^[m" copy-prev-shell-word ## jobs setopt long_list_jobs - -# Check for updates on initial load... -if [ "$DISABLE_AUTO_UPDATE" = "true" ] -then - return -else - /bin/sh $ZSH/tools/check_for_upgrade.sh -fi |