Merge remote-tracking branch 'upstream/master'

* upstream/master: (41 commits)
  fixed typo in tmux plugin
  Update coffee completion
  The current version of bower is completely unavailable, plugin depth modification
  rvm plugin: update to ruby version helpers and rvm-update
  Change duplicated alias name
  Add autocompletion for Rails3.
  Add more capable hg incoming and outgoing count handling
  Add celery completion
  add virtualenv prompt support for agnoster theme
  git-pull add --rebase option
  Typo
  Prevent starting multiple gpg-agents
  Not loading home tmux confs when iTerm2 tmux integration is enabled
  Adding support for iTerm2 tmux integration via option '-CC'
  remove unused function
  autocomplete required packages as second argumet
  debian plugin: ignore alias in sudo/aptitude check
  Add new plugin for homebrew installed version of postgres
  Do not clear tab when calling it with an argument.
  Correctly detect Rapid Board
  ...
This commit is contained in:
Carlos Cardoso 2013-07-12 14:26:59 -03:00
commit b5205c12d4
37 changed files with 923 additions and 99 deletions

View file

@ -1,6 +1,6 @@
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH"
if git pull origin master
if git pull --rebase origin master
then
printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '