diff options
| author | Robby Russell <robby@planetargon.com> | 2009-10-26 09:16:19 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2009-10-26 09:16:19 -0700 |
| commit | 58bccaf6fc7532d5ca8040a7c78997847fd10e06 (patch) | |
| tree | f7c42850f5c3d9ab5169d560b5851771d67c6490 /lib | |
| parent | 1779bedd5362c13e3096873c01c167f329e8fca8 (diff) | |
| parent | 886d97f41e72b8662232a2c6b196fb60508e4f67 (diff) | |
| download | zsh-58bccaf6fc7532d5ca8040a7c78997847fd10e06.tar.gz zsh-58bccaf6fc7532d5ca8040a7c78997847fd10e06.tar.bz2 zsh-58bccaf6fc7532d5ca8040a7c78997847fd10e06.zip | |
Fixing merge conflicts 886d97f41e72b8662232a2c6b196fb60508e4f67
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aliases.zsh | 30 | ||||
| -rw-r--r-- | lib/completion.zsh | 3 |
2 files changed, 25 insertions, 8 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 855dfeb18..c4428d405 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -1,9 +1,9 @@ +#!/bin/zsh + +# Push and pop directories on directory stack alias pu='pushd' alias po='popd' -alias sc='ruby script/console' -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' @@ -11,16 +11,18 @@ 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' +# Basic directory operations alias .='pwd' alias ...='cd ../..' 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' @@ -36,23 +38,39 @@ alias gdb='git branch -d' alias gcount='git shortlog -sn' alias gcp='git cherry-pick' +# Show history alias history='fc -l 1' +# List direcory contents alias ls='ls -F' alias lsa='ls -lahG' +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' alias afind='ack-grep -il' +# 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 &' +<<<<<<< HEAD:lib/aliases.zsh +======= + +## 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' + +>>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh diff --git a/lib/completion.zsh b/lib/completion.zsh index 68ca3b4c1..deeb52824 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -37,8 +37,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 |