1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-18 18:31:59 +00:00
Commit graph

2469 commits

Author SHA1 Message Date
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
Kory Prince
d3babe0d79 Don't show useless '[]' when chruby_prompt_info is empty 2014-03-17 11:02:47 -05: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
Robby Russell
fed807655a Merge pull request #2607 from avonderluft/dev
Show svn dirty on current dir, as well as whole working copy
2014-03-16 18:45:10 -07:00
Robby Russell
8ee9971556 Merge pull request #2613 from Fisiu/ignore-ssh-users
Ignore more users in ssh completion.
2014-03-16 18:44:45 -07:00
Kevin Bongart
baeac5bec9 Remove copyright information, as per #2588 2014-03-16 16:52:37 -04:00
Mariusz Fik
b56e8fb478 Ignore more users in ssh completion.
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-03-16 18:14:34 +01:00
Robby Russell
c9e7129341 Merge pull request #2602 from blueyed/use-default-hosts-completion-2
Use zsh's default for ':completion:*:hosts'
2014-03-15 16:03:30 -07: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
ee21fe9447 Merge pull request #2380 from rkh/chruby-gallois
add chruby info to gallois theme
2014-03-13 16:18:55 -07:00
Robby Russell
8d8df3fd7a Merge pull request #2435 from tompelka/master
Adding commit hash to branch name in my favorit rjk-repos theme.
2014-03-13 16:18:30 -07:00
Robby Russell
d943d23aa0 Merge pull request #2466 from jarus/steeef-virtualenv-fix
Improve virtualenv prompt in steeef theme
2014-03-13 16:18:06 -07:00
Robby Russell
07c2bdf45d Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info
Remove all copyright information in themes. Closes #2587
2014-03-13 16:15:51 -07: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
Robby Russell
552aab6939 Merge pull request #2591 from kevinxucs/remove-extra-aliases
Removed unsolicited aliases.
2014-03-13 13:29:12 -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
47b0d754ae Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install 2014-03-13 10:15:18 -07:00
Daniel Hahler
71d9420637 Use zsh's default for ':completion:*:hosts'
The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009).

The best option appears to be using zsh's default configuration for
':completion:*:hosts'.

While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2) does not state why.
2014-03-13 17:48:58 +01: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
7adf66f942 Merge pull request #1355 from F30/key-bindings
Use terminfo key codes instead of hardcoded ones for key bindings
2014-03-13 08:07:24 -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
0d76d9eb15 Merge pull request #2326 from zakkak/master
Improving comments in the zshrc template
2014-03-13 07:42:51 -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
9cb14dc886 Merge pull request #1085 from avit/install-path
Accept alternate install paths via ZSH variable
2014-03-13 07:35:01 -07:00
Robby Russell
d8ed8f669a Merge pull request #650 from tristan0x/emacs
Emacs
2014-03-13 07:33:23 -07:00
Robby Russell
9272b0b0b1 Merge pull request #2600 from jontewks/patch-1
Update license year
2014-03-13 07:31:26 -07:00
Jon Tewksbury
5f5e5508b0 Update license year
Fix outdated copyright year (updated to 2014).
The copyright year was out of date. Copyright notices must reflect the current year, so this commit updates the listed year to 2014.

See http://www.copyright.gov/circs/circ01.pdf for more info.
2014-03-12 22:37:25 -07:00
Robby Russell
b6cbba9dfe Updating README to show the new install URL, which redirects to the raw files on github. 2014-03-12 07:52:20 -07:00
Robby Russell
86a272ef81 Merge pull request #2596 from ryanwmarsh/fixing_bureau_scrollback
Fixes #2467 tab completion scrolls back in terminal when using bureau
2014-03-11 07:44:30 -07:00