From: John Schulz <jfsiii@JFSIII.local>
Date: Tue, 20 Sep 2011 14:49:10 +0000 (-0400)
Subject: Merge branch 'master' of http://github.com/revans/bash-it
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=11214382c575d62c86b429bd163691a7ba4a934e;p=common%2Fbash_it.git

Merge branch 'master' of github.com/revans/bash-it

* 'master' of http://github.com/revans/bash-it: (51 commits)
  Bundler aliases "inspired by" OhMyZsh
  Updated nvm.plugin.bash
  Do not break out of the loop instead continue with other items in the list.
  Make gshuf alias checker work on other bash versions
  Alias for textmate only on darwin*
  general.aliases.bash: use native tree if [ -x ] ....
  Detect OS in emacs.aliases.bash
  Add simple password generator
  Add alias for shuf -> gshuf
  BOOKMARKing:remove absolute path of sed, to make compatible with OS X
  Add BOOKMARKing functionality to dirs plugin
  Refactored gem completion to load gem lists on demand intead of on load
  Break needed in load_some Y case
  More granular enabling of plugins/completion/aliases
  Add ability to choose what plugins/aliases/completion to install at install time
  Remove automatic creation of enabled plugins/aliases/completion
  add color to the prefix
  make sure its obvious which is ruby and which is python
  add rvm to prompt
  ditch custom virtualenv_prompt in favor of one in base
  ...
---

11214382c575d62c86b429bd163691a7ba4a934e