Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Browse files Browse the repository at this point in the history
  • Loading branch information
Bira committed Jan 4, 2012
2 parents 7f5f42a + 8c45b73 commit ac06d6b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/completion.zsh
Expand Up @@ -39,7 +39,7 @@ hosts=(
"$_global_ssh_hosts[@]"
"$_ssh_hosts[@]"
"$_etc_hosts[@]"
`hostname`
"$HOST"
localhost
)
zstyle ':completion:*:hosts' hosts $hosts
Expand Down
2 changes: 1 addition & 1 deletion plugins/bundler/bundler.plugin.zsh
Expand Up @@ -10,7 +10,7 @@ alias bu="bundle update"

# The following is based on https://github.com/gma/bundler-exec

bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rails rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)
bundled_commands=(cap capify cucumber foreman guard heroku nanoc rackup rainbows rake rspec ruby shotgun spec spork thin unicorn unicorn_rails)

## Functions

Expand Down
2 changes: 1 addition & 1 deletion plugins/ruby/ruby.plugin.zsh
Expand Up @@ -3,4 +3,4 @@
alias sgem='sudo gem'

# Find ruby file
alias rfind='find . -name *.rb | xargs grep -n'
alias rfind='find . -name "*.rb" | xargs grep -n'

0 comments on commit ac06d6b

Please sign in to comment.