Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-16 17:59:04 +02:00
Code Issues Releases Wiki Activity
2,424 Commits 5 Branches 0 Tags
ee8f9eebb5ea0c5d2df8445a46f2d31fdb16efd6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
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 95302af79b Merge pull request #646 from whittle/master 
Change default zshrc to export $ZSH (as required by check_for_upgrade.sh).
 2014-03-22 13:51:47 -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 23fe53eb5f Merge pull request #2634 from danchenkov/master 
added terminfo keys verification
 2014-03-22 13:32:49 -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
Robby Russell 2e74fe735e Merge pull request #2619 from korylprince/master 
Don't show useless '[]' when chruby_prompt_info is empty
 2014-03-22 13:26:51 -07: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
Robby Russell c137c7bf6a Merge pull request #2639 from jieryn/master 
add common video formats FLV and WEBM
 2014-03-22 07:43:41 -07: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
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
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
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
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
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
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
Robby Russell 48579ebf2b Merge pull request #2341 from mcornella/title_backticks 
Avoid evaluating special chars in $LINE on title command (fixes #2234)
 2014-03-08 14:30:55 -08:00
Robby Russell a811ab0ba7 Merge pull request #2331 from posva/catimg 
Catimg plugin
 2014-03-08 08:42:01 -08:00
Robby Russell e744bf22ca Merge pull request #2479 from mrbfrank/theme-agnoster 
theme agnoster: update characters to match latest powerline fonts
 2014-03-08 08:39:54 -08:00
Robby Russell 6a2e65f4c8 Merge pull request #1402 from sergeylukin/master 
Fix install.sh compatibility with /bin/sh
 2014-03-08 08:39:34 -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 ae9a9b7f70 Merge pull request #2481 from felds/master 
highlight the username when root
 2014-03-08 08:15:29 -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 9bd9278b80 Merge pull request #2287 from rumpelsepp/master 
Added/modified some useful aliases.
 2014-03-08 08:10:34 -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
Robby Russell deb08a762e Merge conflicts with af-magic theme 2014-03-08 08:07:04 -08:00
Robby Russell 2208854597 Cleaning up conflict with merge of #2330 2014-03-08 08:02:23 -08: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 74ad998ad0 Merge pull request #2548 from puffnfresh/gitignore-plugin-url 
Fix remaining broken URL in gitignore function
 2014-02-23 06:59:12 -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
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
Robby Russell 861290e40b Merge pull request #2542 from puffnfresh/gitignore-plugin-url 
Fix URL to gi (gitignore) function
 2014-02-18 19:59:02 -08: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
Robby Russell 2ed99037c1 Merge pull request #2516 from lukesteensen/patch-1 
Add 'services' command to homebrew completion
 2014-02-11 19:17:05 -08: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 7a6e2c05af Merge pull request #2342 from blackjid/master 
Prevents oh-my-zsh loading the .zshenv twice
 2014-02-03 22:23:11 -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
Robby Russell d485044169 Merge pull request #2389 from driver2000/patch-1 
Fix bad right prompt placing.
 2014-01-06 20:06:10 -08:00
Robby Russell a609fd5616 Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find 
Fixes tmuxinator plugin `find` on OSX
 2014-01-06 20:03:43 -08:00
Robby Russell e2838f75f0 Merge pull request #2396 from soluwalana/master 
Fix WIP false positive
 2014-01-02 16:01:28 -08:00
Robby Russell a38af27991 Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory." 
This reverts commit 152e1e07e0.
 2013-12-18 17:03:33 -08:00
Robby Russell c9e5adb637 Merge pull request #2358 from n-st/master 
Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
 2013-12-18 17:01:01 -08:00
Robby Russell 357ab4912b Merge pull request #2316 from BBonifield/master 
Making auto-correction off by default.

Okay, I don't feel so strongly these days about this.
 2013-12-04 21:02:58 -08:00
Robby Russell 8c93142b13 Merge pull request #2303 from petervanderdoes/git-flow-avh 
Update git-flow-avh 1.7.0
 2013-12-03 12:51:39 -08:00
Robby Russell 6fa64b7199 Merge pull request #2296 from pstadler/master 
check_for_upgrade.sh: source ~/.profile only if it exists
 2013-12-03 12:51:00 -08: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 7d1b668f41 Merge pull request #2159 from pungoyal/master 
removing a github redirect during install
 2013-12-03 00:18:44 -08:00
Robby Russell f0a7adcd3d Merge pull request #2176 from dejanlukan/spectrum 
Added the spectrum_bls function, which prints all 256 colors set as the background.
 2013-12-03 00:18:17 -08:00
Robby Russell b8c1566835 Merge pull request #2194 from kevinxucs/gitignore-fix 
Minor gitignore fix.
 2013-12-03 00:16:59 -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