Commit graph

1216 commits

Author SHA1 Message Date
Robby Russell d41c588d1b Merge pull request #672 from eMxyzptlk/zsh_reload
Add zsh_reload which provides src function, this function will source .zshrc and rebuilds cache
2014-03-22 13:56:03 -07:00
Robby Russell d8a5fff1a7 Merge pull request #662 from walle/add_autocomplete_for_gas
Update the script to account for the changes in 0.1.7 where .gas is a dir
2014-03-22 13:55:33 -07:00
Robby Russell 319aafce8b Merge pull request #2618 from bdubertret/fix-gwip-norm
Fix gwip alias in git plugin when no files to rm
2014-03-22 13:36:27 -07:00
Robby Russell 73fd0669c0 Merge pull request #2638 from miguelfrde/irb
Add irb to the list of bundled commands
2014-03-22 13:32:19 -07:00
Robby Russell d9683974fe Merge pull request #2605 from mhauserr/patch-1
Added v as a keybinding to edit-command-line in vi-mode
2014-03-22 13:30:16 -07:00
Robby Russell 123510382d Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy
Don't lazy load the virtualenvwrapper
2014-03-22 13:28:30 -07:00
Robby Russell c97aff8f6b Merge pull request #2616 from Bounga/master
Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv
2014-03-22 13:27:56 -07:00
Robby Russell e0e4c0eeaf Merge pull request #2620 from reedriley/master
Fixed errors if acpitool isn't installed on linux
2014-03-22 13:27:28 -07:00
Miguel Flores Ruiz de Eguino 610655e827 Sort bundled commands alphabetically 2014-03-22 10:24:58 -06:00
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
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
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
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