linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into fix-git

Browse source
This commit is contained in:
Alex Light 2012-01-27 11:07:53 -05:00
commit e73c55e7f6
4 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/git.zsh
View file

@ -96,4 +96,4 @@ git_prompt_status() {
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
fi fi
echo $STATUS echo $STATUS
} }

2
plugins/git/git.plugin.zsh
View file

@ -60,4 +60,4 @@ compdef ggpull=git
alias ggpush='git push origin $(current_branch)' alias ggpush='git push origin $(current_branch)'
compdef ggpush=git compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git compdef ggpnp=git

1
plugins/rails/rails.plugin.zsh
View file

@ -2,6 +2,7 @@ alias ss='thin --stats "/thin/stats" start'
alias sg='ruby script/generate' alias sg='ruby script/generate'
alias sd='ruby script/destroy' alias sd='ruby script/destroy'
alias sp='ruby script/plugin' alias sp='ruby script/plugin'
alias sr='ruby script/runner'
alias ssp='ruby script/spec' alias ssp='ruby script/spec'
alias rdbm='rake db:migrate' alias rdbm='rake db:migrate'
alias sc='ruby script/console' alias sc='ruby script/console'

1
plugins/rails3/rails3.plugin.zsh
View file

@ -14,6 +14,7 @@ alias rdb='_rails_command dbconsole'
alias rdbm='rake db:migrate db:test:clone' alias rdbm='rake db:migrate db:test:clone'
alias rg='_rails_command generate' alias rg='_rails_command generate'
alias rp='_rails_command plugin' alias rp='_rails_command plugin'
alias ru='_rails_command runner'
alias rs='_rails_command server' alias rs='_rails_command server'
alias rsd='_rails_command server --debugger' alias rsd='_rails_command server --debugger'
alias devlog='tail -f log/development.log' alias devlog='tail -f log/development.log'