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

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

Browse source
This commit is contained in:
Sean Jones 2012-12-14 23:05:20 +00:00
commit e288ef7056
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@ alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec
bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma)
bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails puma zeus)
## Functions

8
plugins/git-flow/git-flow.plugin.zsh
View file

@ -237,13 +237,13 @@ __git-flow-feature ()
(diff)
_arguments \
':branch:__git_branch_names'\
':branch:__git_flow_feature_list'\
;;
(rebase)
_arguments \
-i'[Do an interactive rebase]' \
':branch:__git_branch_names'
':branch:__git_flow_feature_list'
;;
(checkout)
@ -254,7 +254,7 @@ __git-flow-feature ()
(pull)
_arguments \
':remote:__git_remotes'\
':branch:__git_branch_names'
':branch:__git_flow_feature_list'
;;
*)
@ -334,4 +334,4 @@ __git_command_successful () {
return 0
}
zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'