diff options
| author | SuprDewd <suprdewd@gmail.com> | 2011-01-10 17:56:38 +0000 |
|---|---|---|
| committer | SuprDewd <suprdewd@gmail.com> | 2011-01-10 17:56:38 +0000 |
| commit | beb980d37013ee9cf5f2fdd4f19444f7f7a77fcf (patch) | |
| tree | fab6d1e8a11ba90ef236be37de99096f805e9c7b | |
| parent | bcc235e1420f39a0dbd8a7672dffc0f0c81e9b53 (diff) | |
| parent | 7a9cc198196cb0c935afe96e1de249c3a05ad413 (diff) | |
| download | zsh-beb980d37013ee9cf5f2fdd4f19444f7f7a77fcf.tar.gz zsh-beb980d37013ee9cf5f2fdd4f19444f7f7a77fcf.tar.bz2 zsh-beb980d37013ee9cf5f2fdd4f19444f7f7a77fcf.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
| -rw-r--r-- | lib/directories.zsh | 6 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 5 | ||||
| -rw-r--r-- | plugins/rails3/rails3.plugin.zsh | 8 | ||||
| -rw-r--r-- | themes/fishy.zsh-theme | 9 |
4 files changed, 25 insertions, 3 deletions
diff --git a/lib/directories.zsh b/lib/directories.zsh index 56d7a2316..bb114f615 100644 --- a/lib/directories.zsh +++ b/lib/directories.zsh @@ -36,5 +36,9 @@ cd () { alias md='mkdir -p' alias rd=rmdir +alias d='dirs -v' -alias d='dirs -v'
\ No newline at end of file +# mkdir & cd to it +function mcd() { + mkdir -p "$1" && cd "$1"; +}
\ No newline at end of file diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d317d179d..71a62819b 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -8,6 +8,7 @@ alias gd='git diff | mate' alias gdv='git diff -w "$@" | vim -R -' alias gc='git commit -v' alias gca='git commit -v -a' +alias gco='git checkout' alias gb='git branch' alias gba='git branch -a' alias gcount='git shortlog -sn' @@ -26,7 +27,7 @@ function current_branch() { echo ${ref#refs/heads/} } -# these aliases take advangate of the previous function +# these aliases take advantage of the previous function alias ggpull='git pull origin $(current_branch)' alias ggpush='git push origin $(current_branch)' -alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
\ No newline at end of file +alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh new file mode 100644 index 000000000..20ba0408c --- /dev/null +++ b/plugins/rails3/rails3.plugin.zsh @@ -0,0 +1,8 @@ +alias rs='ruby script/rails server' +alias rg='ruby script/rails generate' +alias rd='ruby script/rails destroy' +alias rp='ruby script/rails plugin' +alias rdbm='rake db:migrate db:test:clone' +alias rc='ruby script/rails console' +alias rd='ruby script/rais server --debugger' +alias devlog='tail -f log/development.log' diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme new file mode 100644 index 000000000..f22eda868 --- /dev/null +++ b/themes/fishy.zsh-theme @@ -0,0 +1,9 @@ +# ZSH Theme emulating the Fish shell's default prompt. + +local user_color='green'; [ $UID -eq 0 ] && user_color='red' +PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) ' +PROMPT2='%{$fg[red]%}\ %{$reset_color%}' +RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)' + +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}" +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" |