* robbyrussell/master: Fixed bug introduced when fixing issue 896 fixed introduced to parse_git_dirty changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate fixed asterisk display for modified repos in git prior to 1.7.2 Removed trailing spaces in Git files. Fixes #867 update rails runner alias to ru added rails to bundled_commands adding engine yard command (ey) to bundler binstubs adding rbenv support to all the rvm themes bug : stop creating those ~ directories add powit command to symlink an app if it hasn't been already don't check for tmp dir add alias to view the standard out (puts) from any pow app take in csexton's changes fix for pow plugin to default to current dir add rails runner alias Replace "git-diff" with "git diff" in the git plugin
Mainly this is to workaround the manifest→Manifest annoyance.
URGENT: Fix for bug introduced in pull request 925
added rails to bundled_commands
add rails runner alias
- avoid rr as it is mostly used for restart rails server
Replace "git-diff" with "git diff" in the git plugin
take in chris sexton's changes to the pow plugin
adding rbenv support to all the rvm themes
Adding Engine Yard command (ey) to bundler binstubs
* 'master' of git://github.com/robbyrussell/oh-my-zsh: (138 commits) Add middleman to bundled commands Grammar update Updated to latest version of taskwarrior completions (using Taskwarrior 2.0b4) added a rake plugin to disable zsh file globbing when calling rake tasks with square brackets fix bundler plugin for root level folders fixing #812: adding plugins w/o plugin.zsh file to fpath. Add Thor to bundled commands Removed the assignments to fpath as well, since that's all handled in the .oh-my-zsh/oh-my-zsh.sh boot script. Don’t report that Oh My Zsh has been updated when it hasn’t. Removed calls to compinit in the extract and the bundler plugins. compinit should only be called once, after all modules, libs, etc are imported. check if autojump is installed Kill the compdef; Introduce 'grh' alias for 'git reset HEAD' add annotate remove the -v flag from a few mercurial aliases Git Plugin: adds 'grhh' alias for 'git reset HEAD --hard' Apple Terminal.app resume directory plugin autojump plugin enhanced Fixed the rfind command in the ruby plugin Get the Hostname bundler plugin - don't "bundle exec rails" ...
Fix bundler plugin for root level folders
github plugin: only alias git=hub if `hub --version` works.
autojump plugin enhanced
remove the -v flag from a few mercurial aliases
Updated to the latest taskwarrior completion definition (2.0b4)
Git Plugin: add 'grhh' alias for 'git reset HEAD --hard'
Add middleman to bundled commands in bundler plugin
add powit command to symlink an app if it hasn't been already