linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-12 20:21:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2598 commits 1 branch 0 tags 140 MiB
Commit graph

1339 commits

Author SHA1 Message Date
Robby Russell
2403b05613 Merge pull request #2440 from m0nah/master 
Add Laravel4 plugin
 2014-03-22 07:57:14 -07:00
Robby Russell
e7420736db Merge pull request #2510 from pavoljuhas/master 
Add scd plugin for smart change of directory.
 2014-03-22 07:56:35 -07:00
Robby Russell
2e06412ee0 Merge pull request #2531 from KevinBongart/rake-fast 
Add rake-fast plugin for fast rake autocompletion
 2014-03-22 07:53:36 -07:00
Robby Russell
6d616de6f1 Merge pull request #2637 from aforty/master 
Atom plugin
 2014-03-22 07:52:24 -07:00
Robby Russell
184e93cb05 Merge pull request #2627 from loxley/add_knife_vault_cmd 
Add chef-vault knife cmd support
 2014-03-22 07:47:39 -07:00
Robby Russell
c98883f5be Merge pull request #2631 from AntoineD/master 
Fix dirpersist plugin
 2014-03-22 07:47:18 -07:00
jieryn
1509ac9a04 add common video formats FLV and WEBM 2014-03-22 08:51:26 -04:00
Miguel Flores Ruiz de Eguino
c3150edad2 Add irb to the list of bundled commands 2014-03-21 19:18:29 -06:00
Kevin Bongart
6a8f83bc50 Add new brew cask commands 2014-03-21 14:02:26 -04:00
Arno Fortelny
5f31190ab9 atom plugin 2014-03-21 11:49:52 -04:00
Antoine Dechaume
ef343eef30 Fix dirpersist plugin 
This plugin did not work, I just found the same functionnality in grml, this one works.
 2014-03-20 10:43:33 +01:00
Reed Riley
fb2d6eb567 Fixed errors if acpitool isn't installed on linux 2014-03-18 14:13:54 -04:00
Johan Svensson
645fceb38b Add chef-vault knife cmd support 2014-03-18 10:52:25 +01:00
Pavol Juhas
c1c107cfb9 Add scd plugin for smart change of directory. 
Synced with the scd-tracker branch
pavoljuhas/oh-my-zsh@2f78243cad.
 2014-03-17 19:49:12 -04:00
Pavol Juhas
6952105bfe Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2014-03-17 19:48:10 -04:00
Benoit Dubertret
a869ec9bc8 Fix gwip alias in git plugin when no files to rm 2014-03-17 16:07:46 +01:00
Bob Williams
5a586670d7 Merge remote-tracking branch 'upstream/master' 2014-03-17 09:32:57 -04:00
Nicolas Cavigneaux
baf2ab1bf1 Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv 
Hard setting RBENV_ROOT to "$HOME/.rbenv" when using Homebrew's rbenv
will breaks it. It has to be set to $(brew --prefix rbenv).
 2014-03-17 10:05:56 +01:00
Robby Russell
ca90021630 Merge pull request #2576 from jeffwilliams/master 
Added dirhistory plugin.
 2014-03-16 20:49:30 -07:00
Robby Russell
81d53af971 Merge pull request #2597 from githubhjs/master 
List pkgs by size
 2014-03-16 20:45:18 -07:00
Felix Laurie von Massenbach
3be2e34d96 Don't lazy load the virtualenvwrapper. 
Fix robbyrussell#2355.
 2014-03-17 02:17:30 +00:00
Robby Russell
12415a99d2 Merge pull request #2539 from chriswiggins/master 
Update battery plugin to show calculating - OSX
 2014-03-16 18:49:07 -07:00
Robby Russell
dcae31d071 Merge pull request #2549 from brandon-beacher/master 
Remove mailcatcher from the bundler plugin.
 2014-03-16 18:47:05 -07:00
Robby Russell
23a43e9fd6 Merge pull request #2574 from thiagowfx/linux-battery 
added the linux implementation to the battery plugin
 2014-03-16 18:46:50 -07:00
Robby Russell
080409a5a7 Merge pull request #2603 from docwhat/ssh-agent-hostname 
ssh-agent: prevent environment file from flapping
 2014-03-16 18:46:05 -07:00
Kevin Bongart
baeac5bec9 Remove copyright information, as per #2588 2014-03-16 16:52:37 -04:00
Andrew vonderLuft
bf4d4db72b Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev 2014-03-14 13:17:43 -07:00
Andrew vonderLuft
8f7971349b add option to show dirty status of current dir 2014-03-14 13:17:03 -07:00
Bob Williams
223fd60ba5 Merge remote-tracking branch 'upstream/master' 2014-03-14 10:32:03 -04:00
Michael Hauser-Raspe
9e90bf0f23 Added v as a keybinding to edit-command-line 
taken from [here](http://www.zsh.org/mla/users/2008/msg01013.html)
We want pressing v in command mode to take us to an editor (defined by the $VISUAL or $EDITOR variable or vi) to edit the current contents of the command line which (I believe) is a standard feature of bash vi-mode or other readline prompts (see [here](http://www.catonmat.net/download/bash-vi-editing-mode-cheat-sheet.pdf) and [here](http://www.catonmat.net/blog/bash-vi-editing-mode-cheat-sheet/) for source).
 2014-03-14 10:14:47 +00:00
Robby Russell
d752c8cbc1 Merge pull request #2584 from joukojo/master 
added mvn-update
 2014-03-13 16:14:37 -07:00
Robby Russell
3b604c6cd9 Merge pull request #2590 from zhouhua015/master 
Fix hgsl alias.
 2014-03-13 16:14:24 -07:00
Robby Russell
d058c9d3f7 Merge pull request #2593 from bobmaerten/typo-docker-plugin 
Typo in autocomplete arguments for docker plugin
 2014-03-13 16:13:20 -07:00
Christian Höltje
cfe468f6f6 ssh-agent: prevent environment file from flapping 
On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to.  This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.

Instead, use `scutil --get ComputerName` to get something
more stable.
 2014-03-13 14:44:58 -04:00
Robby Russell
de78e47d27 Merge pull request #2149 from cristim/master 
Added a completion plugin for the new aws-cli tool
 2014-03-13 08:07:46 -07:00
Robby Russell
ca648ae7b1 Merge pull request #2072 from jorge-d/master 
Add autocompletion plugin for meteor command
 2014-03-13 08:06:42 -07:00
Robby Russell
d65a153593 Merge pull request #2595 from ksamdev/git.io 
Add github url shortener
 2014-03-13 08:05:44 -07:00
Robby Russell
d0dcedcde2 Merge pull request #2421 from LFDM/rails_plugin_fix 
Fixes _rails_command in new rails plugin
 2014-03-13 07:55:19 -07:00
Robby Russell
7c95518f80 Merge pull request #2518 from erawk/master 
Updated _brew zsh autocompletion to latest Homebrew upstream
 2014-03-13 07:44:01 -07:00
Robby Russell
e8b85f9202 Merge pull request #1776 from ronshapiro/master 
plugged_in function
 2014-03-13 07:41:18 -07:00
Robby Russell
a5df4d79c7 Merge pull request #1501 from gambhiro/master 
more lol
 2014-03-13 07:40:40 -07:00
Robby Russell
d8ed8f669a Merge pull request #650 from tristan0x/emacs 
Emacs
 2014-03-13 07:33:23 -07:00
Josh Chih-Hsueh Huang
ae2f6f34e3 List pkgs by size 2014-03-11 11:29:25 +08:00
Samvel Khalatyan
b9841b0bae Add github url shortener 2014-03-10 17:18:50 -05:00
Bob Maerten
3c9a29b0d6 Fix typo in autocomplete arguments 2014-03-10 16:23:14 +01:00
Zhou Hua
de0e7b5dc8 Fix hgsl alias. 
The original 'hgsl' missed 'hg' part.
 2014-03-10 11:41:25 +08:00
Robby Russell
a811ab0ba7 Merge pull request #2331 from posva/catimg 
Catimg plugin
 2014-03-08 08:42:01 -08:00
Robby Russell
59db638d99 Merge pull request #2565 from theallegedjosh/master 
ruby-gems aliases
 2014-03-08 08:34:50 -08:00
Robby Russell
7b7c5fd12b Merge pull request #2579 from mfaerevaag/master 
Updated wd plugin to v0.3.0
 2014-03-08 08:33:14 -08:00
Robby Russell
0018969b80 Merge pull request #2535 from IgorTimoshenko/feature/yii-plugin 
Added Yii basic command completion
 2014-03-08 08:32:37 -08:00
Robby Russell
01261d4795 Merge pull request #2556 from chrisjones-brack3t/fix/git-prompt-1-9 
git-prompt (gitstatus.py) plugin fix
 2014-03-08 08:23:16 -08:00
Robby Russell
0e10ebb9f6 Merge pull request #2572 from kevinxucs/sublime-linux-fix 
Fixed sublime plugin behaviors.
 2014-03-08 08:22:55 -08:00
Robby Russell
0e31bed555 Merge pull request #2059 from felipec/fc/gitfast 
gitfast: update to upstream v1.8.4
 2014-03-08 08:21:12 -08:00
Robby Russell
755f8094b8 Merge pull request #2529 from emanuelez/patch-1 
Improve oneline logs
 2014-03-08 08:16:34 -08:00
Robby Russell
95e6feaf76 Merge pull request #2525 from lukesteensen/update-go-plugin 
unify and update golang plugins
 2014-03-08 08:15:54 -08:00
Robby Russell
7b06ce70a6 Merge pull request #2366 from chuancong/patch-1 
pip: Add support to command "show"
 2014-03-08 08:14:16 -08:00
Robby Russell
cc926e9987 Merge pull request #2322 from dpsk/patch-2 
Add alias to rails plugin
 2014-03-08 08:13:48 -08:00
Robby Russell
92a54ebc7e Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root 
rbenv plugin: don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
 2014-03-08 08:13:19 -08:00
Robby Russell
978bb40d03 Merge pull request #2564 from miry/patch-3 
Added simulator alias for Xcode plugin
 2014-03-08 08:10:53 -08:00
Robby Russell
7a14ab7f38 Merge pull request #2400 from bric3/svn_fast_plugin 
new faster SVN plugin
 2014-03-08 08:08:47 -08:00
Jouko Johansson
fd8ce7f8e3 added mvnjetty alias 2014-03-07 01:23:37 +02:00
Jouko Johansson
7378765a79 added aliases for tomcat:run tomcat7:run 2014-03-07 01:22:37 +02:00
Jouko Johansson
8b667b2299 added mvn-update 2014-03-07 01:09:04 +02:00
Markus Faerevaag
d41ac7fe3e Updated wd plugin to v0.3.0 2014-03-04 20:25:54 +01:00
Jeff Williams
c0b98cd6ac Added dirhistory plugin. 
This plugin navigates directory history using ALT-LEFT and ALT-RIGHT.
 2014-03-03 10:18:10 -05:00
Kaiwen Xu
2691520d6f Integrate changes from #1841. 2014-03-02 14:13:55 -05:00
Thiago Perrotta
564a708d6a added the linux implementation to the battery plugin 2014-03-02 14:47:43 -03:00
Kaiwen Xu
5ba96e9a05 Fixed sublime plugin behaviors. 
- Fixed subl search path order in Mac because Sublime Text 3 is named
  Sublime Text.app by default instead of Sublime Text 3.app and they are
  mostly likely to be placed in /Applications instead of
  $HOME/Applications.
- Fixed sublime text binary path in Linux. The sublime_text binary
  installed by Ubuntu installer is placed in /opt/sublime_text/sublime_text
  instead of /usr/bin/sublime_text.
- Use zsh's built-in process detach syntax instead of nohup.
 2014-03-02 03:59:27 -05:00
Michael Nikitochkin
6dcdfe61e2 🐼 Added simulator alias for Xcode plugin 
It is often required to start simulator without Xcode.
 2014-02-28 13:55:15 +02:00
Bob Williams
185cb6e373 adding support for node 2014-02-27 10:56:07 -05:00
Josh Burns
fdbf0cbe46 gem push alias and gem yank alias 2014-02-28 01:32:01 +11:00
Josh Burns
da573f6356 add gem push alias 2014-02-28 01:26:54 +11:00
Josh Burns
f139401485 add gem build alias 2014-02-28 01:26:17 +11:00
Bob Williams
56babe6538 Adds command line aliases useful for dealing with JSON 2014-02-26 19:35:24 -05:00
Robby Russell
6b3c953775 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2014-02-25 20:27:51 -08:00
Robby Russell
6cc240811f ..a fundamental piece of matter. 2014-02-25 20:27:33 -08:00
Robby Russell
2eb68a4e29 Merge pull request #2544 from fduch2k/patch-1 
Update gitignore.plugin.zsh
 2014-02-23 06:58:43 -08:00
Eduardo San Martin Morote
8309b0a19b Verification of convert inside the function 
Depending on when the path is declared this solution would work in any case
 2014-02-23 10:07:26 +01:00
Chris Jones
c397000b3b grab last item in list which is the branch instead of relying on position. 2014-02-21 22:48:38 -08:00
Chris Jones
7a546362d3 Much needed PEP8 love. Use spaces, not tabs. 2014-02-21 22:47:56 -08:00
Robby Russell
598a9c6f99 Adieu l'ami. 
@jimweirich -- You will be missed.
 2014-02-20 10:18:53 -08:00
Robby Russell
500cbbc79b Merge pull request #2541 from puffnfresh/cabal-sandboxes-info 
Add cabal_sandbox_info function
 2014-02-19 18:23:30 -08:00
Brandon Beacher
840ae4382e Remove mailcatcher from the bundler plugin. 
Recommended by @sj26 per https://github.com/sj26/mailcatcher#bundler.
 2014-02-19 18:55:52 -05:00
Alexander Hramov
bd4f7e24ea Update gitignore.plugin.zsh 
Fix URL to gi (gitignore) function in _gitignireio_get_command_list function
 2014-02-19 15:08:47 +03:00
Brian McKenna
1df7d01618 Fix URL to gi (gitignore) function 
Previous URL doesn't seem to work because the host requires a www
prefix.
 2014-02-18 14:43:42 -07:00
Brian McKenna
358b6ffcde Add cabal_sandbox_info function 
Reports whether the current working directory is within a
sandbox. Useful to check before installing Cabal packages into the
global registry.
 2014-02-18 14:37:59 -07:00
Chris Wiggins
fdd864bd5b Update battery plugin to show calculating - OSX 
Instantly after removing the charger, I have found that the "AvgTimeToEmpty" value can swing to rediculous values. Apple's current claim is that the max battery life is 12 hours, so any value larger than this is considered a "time is being calculated" value.
 2014-02-17 13:32:24 +13:00
Igor Timoshenko
354593e9b2 Added Yii basic command completion 2014-02-14 14:55:00 +00:00
Kevin Bongart
1a029f2935 Add rake-fast plugin for fast rake autocompletion 2014-02-13 12:27:00 -05:00
Emanuele Zattin
f6f3e93019 Improve oneline logs 
Add decorate and color to the normal oneline and add a new alias for graph oneline logs.
 2014-02-13 10:32:52 +01:00
Luke Steensen
aa9db3e8f9 update golang plugin to match official version 2014-02-12 20:13:00 -06:00
Luke Steensen
2078e7d4de remove duplicate 'go' plugin, symlink to 'golang' 2014-02-12 20:09:44 -06:00
Ed Lui
f3f0a54259 Updated _brew zsh autocompletion to latest Homebrew upstream 2014-02-11 22:45:41 -05:00
Robby Russell
4ce7f0a37f Merge pull request #2515 from nupfel/plugins/iwhois 
provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server
 2014-02-11 19:18:10 -08:00
Luke Steensen
0d212bb218 Add 'services' command to homebrew completion 2014-02-11 21:14:02 -06:00
Tobias Kirschstein
0cb2ecff80 provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server 2014-02-11 20:05:59 +13:00
Florian Franzen
c563fe95fb Makes history-substring-search use term specific up and down buttons. Fixes #2089. 2014-02-09 14:06:58 +01:00
Pavol Juhas
ed19ffee5e Add scd plugin for smart change of directory. 
Synced with the scd-tracker branch pavoljuhas/oh-my-zsh@9d04d8ca78
 2014-02-08 20:09:51 -05:00
Robby Russell
ec37c05cb3 Merge pull request #2465 from klange/master 
change nyancat telnet server
 2014-02-03 22:23:46 -08:00
Robby Russell
41d9717252 Merge pull request #2402 from bric3/battery_level_gauge 
Adds a method that print a battery gauge
 2014-02-03 22:22:36 -08:00
Robby Russell
df0305aba5 Merge pull request #2368 from lumbric/master 
fix name schema for sudo plugin
 2014-01-28 16:22:14 -08:00
Kevin Lange
a48fd1e808 Update nyan.plugin.zsh 2014-01-24 10:27:41 -08:00
Kevin Lange
9b3344dd80 change nyancat telnet server 
miku.acm.uiuc.edu was decommissioned a while ago; this is a sanctioned mirror
 2014-01-23 20:58:23 -08:00
Brice Dutheil
cc8b09366b Adds a method that print a battery gauge 
It is especially useful for themes, this function is a port of the code written by Steve Losh
and made available on [this blog entry](http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/#my-right-prompt-battery-capacity)
 2014-01-18 13:58:42 +01:00
Evgeny Golubev
7b9e48992f Add Laravel4 plugin 2014-01-17 12:59:14 +03:00
LFDM
a6671919ab Fixes _rails_command 
Changes precedence of the conditional clause, more recent versions come
first now. Fixes problems when users update their app and still have
the old rails files inside of their file tree.
Closes #2405 - check the discussion there for further info.
 2014-01-10 22:52:18 +01:00
Brice Dutheil
ca129bb550 Renames main plugin function to svn_prompt_info 2014-01-10 14:03:10 +01:00
Brice Dutheil
f66ab7f98f Renamed the methods of this script 2014-01-08 03:04:54 +01:00
Brice Dutheil
8ede6c6af3 Added further cleanup and svn status information 2014-01-08 02:50:58 +01:00
LFDM
8bf8e1ecf9 Heavy refactor of svn-fast-info 2014-01-07 10:07:02 +01:00
Brice Dutheil
642ae64bc5 Inline parse_svn to avoid leaky state 
As noted in review, `in_svn` is not properly reset to false. This is better anyway to not leak state.
 2014-01-07 02:10:34 +01:00
Brice Dutheil
1304ed8d25 Report the SVN need upgrade 
This happen when subversion 1.7+ is used on a repository created with subversion up to 1.6
 2014-01-06 14:09:40 +01:00
Brice Dutheil
9ce1b6289a new faster SVN plugin 2014-01-04 22:08:00 +01:00
Pablo Cantero
4354f91171 Fixes tmuxinator plugin find on OSX 2014-01-03 11:52:33 -02:00
Patrick Stadler
288604ef1a add brew-cask plugin 2014-01-03 14:32:49 +01:00
Sam O
d60522c7a2 escape dashes 2014-01-02 15:53:34 -08:00
Sam O
827d9dfcb4 Update git.plugin.zsh 2014-01-02 15:48:09 -08:00
lumbric
b58b996b40 fix name schema for sudo plugin 
Plugin won't load automatically if added to variable $plugins, if name schema different than $name/$name.plugin.zsh is used (see is_plugin() in oh-my-zsh.sh).
 2013-12-21 19:49:44 +01:00
chuancong
e41b6acd2a Add support to command "show" 2013-12-19 11:24:38 -08:00
Mikhail Nikalyukin
fdfc907052 Add rdmtc alias for rails plugin. 2013-12-11 11:42:11 +02:00
Eduardo San Martin Morote
44b23ae194 catimg: fix exit without using source 
supresses errors from convert whilen converting, as they
are usually just warnings
 2013-12-09 22:18:20 +01:00
Eduardo San Martin Morote
349fa15b18 Fixed a dirs bug for catimg 2013-12-09 22:07:19 +01:00
Eduardo San Martin Morote
0185d9920b catimg plugin 
allow to print an image to the stdout using convert
 2013-12-09 08:54:38 +01:00
Peter van der Does
2ffca06806 Update git-flow-avh 1.7.0 2013-12-03 08:56:18 -05:00
Robby Russell
4e34588a5b Merge pull request #2208 from onemouth/master 
Update git.plugin.zsh
 2013-12-03 00:20:36 -08:00
Robby Russell
032ca0d67c Merge pull request #2173 from jeffrey4l/venv 
Add support .venv folder as virtual env
 2013-12-03 00:19:21 -08:00
Robby Russell
83c18f8553 Merge pull request #2195 from KevinBongart/command_blacklist_for_bundler_plugin 
Add command blacklist support to bundler plugin
 2013-12-03 00:16:22 -08:00
Robby Russell
aed9cff57a Merge pull request #2215 from posva/rand-quote 
Update rand-quote plugin
 2013-12-03 00:15:24 -08:00
Robby Russell
b422b073f1 Merge pull request #2255 from shadyproject/plugin/xcode-support 
basic command line xcode functionality
 2013-12-03 00:04:00 -08:00
Robby Russell
4be8c51446 Merge pull request #2258 from amilaperera/master 
getting the projects name correctly and making compdef to work with mux ...
 2013-12-03 00:03:34 -08:00
Robby Russell
b764fad271 Merge pull request #2262 from mfaerevaag/master 
Fixed and improved wd plugin
 2013-12-03 00:02:47 -08:00
Robby Russell
de35b55141 Merge pull request #1136 from koraa/pull_req_fastfile 
On-the-fly creation and usage for file/dir shortcuts
 2013-12-02 23:47:40 -08:00
Robby Russell
4bb8bd8007 Merge pull request #1135 from koraa/pull_req_sinchar 
Singel character aliases (and combinations) for grep, wegt, cat, pagers, xargs, sudo and more
 2013-12-02 23:47:30 -08:00
Robby Russell
c9dd778ec0 Merge pull request #1201 from koraa/pull_req_debian 
Fix Debian Plugin Auto Completion
 2013-12-02 23:46:32 -08:00
Robby Russell
5a32796fc5 Merge pull request #2088 from Stibbons/gsemet_push_pep_pylint_completion 
Completion for python, pep8, autopep8 and pylint
 2013-12-02 23:45:35 -08:00
Robby Russell
19ce09c008 Merge pull request #2086 from Stibbons/gsemet_push_repo 
New aliases for repo plugin
 2013-12-02 23:44:55 -08:00
Robby Russell
bc79f61901 Merge pull request #1866 from Stibbons/gsemet_push_common_aliases 
New plugin 'common-aliases' for optional cutting edge zsh aliases
 2013-12-02 23:42:46 -08:00
Robby Russell
7c3665bd2e Merge pull request #2003 from dongweiming/update-gem 
Update gem completion
 2013-12-02 23:41:31 -08:00
Robby Russell
c0a6f8a8a2 Merge pull request #1950 from dongweiming/add-systemadmin-plugin 
Add a plugin for systemadmin ops and developer
 2013-12-02 23:41:09 -08:00
Robby Russell
573830ba37 Merge pull request #1947 from dongweiming/add-sudo 
Add sudo plugin
 2013-12-02 23:40:12 -08:00
Robby Russell
2f3bddccfb Merge pull request #1931 from dongweiming/update-urltools 
Add shell built method
 2013-12-02 23:39:26 -08:00
Robby Russell
027c9ee4cd Merge pull request #1942 from dongweiming/update-powify 
Update powify for displayed parameter is not enough, and when there is no directory error
 2013-12-02 23:39:06 -08:00
Robby Russell
b93f3b9f5a Merge pull request #1940 from dongweiming/update-supervisor 
Add version option
 2013-12-02 23:38:45 -08:00
Robby Russell
b6f4a887ac Merge pull request #2131 from stevschmid/patch-1 
Fix gallois theme
 2013-12-02 23:24:01 -08:00
Robby Russell
3d6f9d78c5 Merge pull request #306 from jtriley/git-prompt 
add git-prompt plugin from olivierverdier/zsh-git-prompt
 2013-12-02 22:49:08 -08:00
Robby Russell
7f3e56f8d6 Merge pull request #2198 from Larandar/master 
[PLUGINS] Brew: Add "options" as a valide first argument
 2013-12-02 22:45:55 -08:00
Robby Russell
182652b00a Merge pull request #2202 from kevinxucs/themes-random 
themes plugin now picks a random theme if no argument is provided.
 2013-12-02 22:43:52 -08:00
Robby Russell
9a40ae9b5f Merge pull request #2212 from bsiegel/bundler_bi_function 
Change bundler plugin's `bi` alias to a function
 2013-12-02 22:42:50 -08:00
Robby Russell
e25329fcf6 Merge pull request #2222 from jamesoff/fix-battery-plugin 
Prevent errors in prompts if no battery info available.
 2013-12-02 22:39:45 -08:00
Brandon Siegel
22c0db64ee Change bi alias to a function 
Only check the bundler version when we call bi. This fixes two issues:
First, if there is no bundler available system-wide this will cause an
error each time zsh loads. Second, if new bundler is installed
system-wide but you change into an rbenv with an older version, the
alias will no longer work.
 2013-12-02 10:51:25 -05:00