Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-30 16:41:01 +02:00
Code Issues Releases Wiki Activity
830 Commits 4 Branches 0 Tags
3e7e52a25fbfdb57f291ee9575a606f845dbff57
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robby Russell 7c36ef7faa Adding critical security patch to let you all know I'm on top of this shit. add 'nyan' to your plugins... then run for security upgrade. 2011-12-06 13:51:31 -08:00
Robby Russell 757fa3314d Merge pull request #505 from masnick/master 
Add new theme (fino.zsh-theme)
 2011-10-10 05:50:44 -07:00
Robby Russell b8ade4815a Merge pull request #529 from dbb/master 
Merge 'deb' and 'debian' plugins
 2011-10-10 05:48:49 -07:00
Robby Russell 03fc819bee Merge pull request #552 from Tricon/master 
Purple Apple Logo Theme
 2011-10-10 05:46:08 -07:00
Robby Russell 833c856b84 Merge pull request #579 from hakanensari/bundler-plugin-patch 
Bundler plugin patch
 2011-10-10 05:45:19 -07:00
Robby Russell dfc7319491 Merge pull request #594 from sirech/fix-bundle-compl 
Fix completion for bundled commands using the bundler plugin
 2011-10-10 05:44:26 -07:00
Robby Russell cceb387e0b Merge pull request #595 from zachriggle/grails-plugin 
Grails plugin
 2011-10-10 05:42:56 -07:00
Robby Russell 0fe2462af8 Merge pull request #554 from toolbear/549-fix-auto-upgrade 
Fix auto upgrade failure from non-exported ZSH env var
 2011-10-10 05:40:38 -07:00
Robby Russell 167f84dacd Merge pull request #607 from vddgil/patch-1 
Textmate plugin update to take Gemfile and cucumber features in account
 2011-10-10 05:40:01 -07:00
Robby Russell c5e6dbf76b Merge pull request #613 from rkj/master 
Please merge my theme.
 2011-10-10 05:39:35 -07:00
Robby Russell 15d7a4c225 Merge pull request #614 from philippbosch/feature/terminitor-plugin 
terminitor plugin
 2011-10-10 05:38:57 -07:00
Robby Russell 85fd141ff9 Merge pull request #622 from foozmeat/master 
This is the correct way to check the return value
 2011-10-10 05:36:39 -07:00
Robby Russell ebd0523a4a Merge pull request #626 from nickstenning/upstream 
Better cake completion
 2011-10-10 05:36:23 -07:00
Robby Russell 72adfb6cc7 Merge pull request #631 from danshearmur/git-merge-alias 
added git merge as gm
 2011-10-10 05:35:16 -07:00
Robby Russell 57f04b921e Merge pull request #645 from mr-szymanski/master 
Add "wuffers" theme
 2011-10-10 05:33:55 -07:00
Robby Russell 1228638b41 Merge pull request #648 from SFEley/d926a55872b5a12ab8b987e9d86c02358d0c825e 
New theme - Crunch
 2011-10-10 05:33:12 -07:00
Robby Russell 26b20e21e1 Merge pull request #418 from ptrv/master 
Added Mercurial plugin
 2011-10-10 05:31:54 -07:00
Robby Russell 11a0c33323 Merge pull request #441 from Gonzih/master 
Create gnzh theme and vundle plugin
 2011-10-10 05:30:55 -07:00
Robby Russell cc82ac1ed6 Merge pull request #273 from blueyed/hub-alias-only-with-ruby 
Minor fix for the github plugin: check for `ruby`.
 2011-10-10 05:27:33 -07:00
Robby Russell 490177d48b Merge pull request #225 from Soliah/plugin-bundler 
Add tab completion to bundler plugin
 2011-10-10 05:26:28 -07:00
Robby Russell 7b6b6f1d92 Merge pull request #205 from sorin-ionescu/plugin-gnu-utils 
gnu-utils plugin
 2011-10-10 05:24:38 -07:00
Robby Russell 84c20ce6dd Merge pull request #482 from volpino/master 
Theme chooser + fox's theme
 2011-10-10 05:17:21 -07:00
Robby Russell e91e384497 Merge pull request #428 from matthewmccullough/gradleplugin 
Added a gradle build tool plugin
 2011-10-10 05:12:43 -07:00
Robby Russell e59a9cbbaa Merge pull request #338 from norm2782/master 
Added my norm theme to oh-my-zsh
 2011-10-10 05:10:27 -07:00
Robby Russell 6cc4389304 Merge pull request #319 from sorin-ionescu/plugin-npm 
Replace npm 0.x completion with 1.0 completion.
 2011-10-10 05:10:03 -07:00
Robby Russell 1ab0054dc6 Merge pull request #275 from tristan0x/require_tool 
New script $ZSH/tools/require_tool.sh to ensure version of tool
 2011-10-10 05:08:38 -07:00
Robby Russell 6e8c0c178d Merge pull request #274 from diofeher/master 
A python plugin
 2011-10-10 05:07:35 -07:00
Robby Russell 14bb3105d3 Merge pull request #525 from kibs/master 
Option for setting a different path to your custom files and plugins.
 2011-10-10 04:57:57 -07:00
Robby Russell 762b55bb2b Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506 
Add key bindings for gnome-terminal on Fedora
 2011-08-30 21:09:36 -07:00
Robby Russell 0b01195a09 Merge pull request #408 from thunfischbrot/patch-1 
Included some essential aliases in the lol plugin
 2011-08-30 21:06:05 -07:00
Robby Russell 91d02ffbc1 Merge pull request #575 from mr-szymanski/master 
Add git alias
 2011-08-30 21:04:04 -07:00
Robby Russell 9d67d75b0a Revert "Enable red dots during completion by default". 
After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.

This reverts commit fc49b4a4de.
 2011-08-30 20:56:13 -07:00
Robby Russell 9f46eafae0 Merge pull request #545 from ches/patch-1 
Add guard to bundler plugin's wrapped commands
 2011-08-12 19:22:10 -07:00
Robby Russell dc7eee4db0 Merge pull request #543 from dmondark/heroku-completion 
Heroku completion plugin
 2011-08-12 12:57:44 -07:00
Robby Russell be2ab22694 Merge pull request #492 from hwti/red-dots-completion 
Display red dots during completion process (disabled by default)
 2011-08-11 05:51:03 -07:00
Robby Russell 098e515eff Merge pull request #512 from ichesnokov/master 
a little fix for showing colors during upgrade
 2011-08-11 05:49:19 -07:00
Robby Russell 6682e7c43f Merge pull request #515 from rahult/feature/powder-plugin 
Auto Complete Plugin for powder gem
 2011-08-11 05:47:12 -07:00
Robby Russell a738ca9b64 Merge pull request #464 from bkonkle/patch-1 
Minor corrections to deletion detection in git_prompt_status
 2011-07-30 18:08:54 -07:00
Robby Russell 52a99d947e Merge pull request #507 from walle/add_autocomplete_for_gas 
Add autocomplete for gas
 2011-07-30 18:06:52 -07:00
Robby Russell dee8171fa9 Merge pull request #494 from EspadaV8/master 
Fixed an issue where the SVN plugin would mark a folder as being dirty when there was an svn:external set.
 2011-07-27 21:11:49 -07:00
Robby Russell 4ff45581de Merge pull request #496 from semmons99/master 
add alias for `bundle package` to the bundler plugin
 2011-07-27 21:08:17 -07:00
Robby Russell 383ff03cca Merge pull request #502 from sunaku/history 
move history-substring-search* files into plugins/
 2011-07-27 21:06:54 -07:00
Robby Russell 3350c2298f Merge pull request #488 from dreur/upstream-archlinux-plugin 
Remove sudo when using yaourt + do not rely on abs when not in path - In
 2011-07-23 09:46:45 -07:00
Robby Russell dbc674988e Merge pull request #259 from dereine/master 
Add a plugin to support kate the kde text editor
 2011-07-23 09:40:54 -07:00
Robby Russell 2816ea726e Merge pull request #251 from kalasjocke/master 
New terminalparty theme
 2011-07-23 09:39:25 -07:00
Robby Russell fc6f07206e Merge pull request #215 from sunaku/history 
history substring search plugin from fizsh
 2011-07-23 09:36:30 -07:00
Robby Russell 46440e7198 Merge pull request #208 from sorin-ionescu/plugin-extract 
extract plugin
 2011-07-23 09:33:42 -07:00
Robby Russell 250bee9cda Merge pull request #206 from sorin-ionescu/plugin-osx 
Vastly improved Mac OS X plugin
 2011-07-23 09:27:31 -07:00
Robby Russell 92467e0b90 Merge pull request #167 from jarinudom/master 
Add superjarin theme that shows current ruby version via RVM
 2011-07-23 09:25:30 -07:00
Robby Russell dd6cc96bb1 Merge pull request #112 from lukerandall/master 
Update theme to support fine grained git status
 2011-07-23 09:15:42 -07:00
Robby Russell 9e783c0a8e fixing issue with last commit merge. missed a conflict 2011-07-23 09:14:44 -07:00
Robby Russell 5e4d89385f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-07-23 09:13:57 -07:00
Robby Russell bea196de3b Merge pull request #412 from transat/master 
Added git-friendly 'wedisagree' theme.
 2011-07-23 09:03:15 -07:00
Robby Russell 7a452fd950 Merge pull request #461 from dpoggi/master 
Added 'dpoggi' theme
 2011-07-23 08:59:30 -07:00
Robby Russell ae9457d84d Merge pull request #487 from dreur/upstream-spectrum-utility 
Add utility method to spectrum
 2011-07-23 08:58:10 -07:00
Robby Russell 8a102b941f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-07-23 08:41:44 -07:00
Robby Russell 2a64d08889 Merge pull request #107 from philips/philips-theme 
Philips theme, sorry :-/
 2011-07-23 08:29:05 -07:00
Robby Russell d6ffebebc5 Merge pull request #484 from msabramo/f9bf396e4ac68299f1370ed54350cc14ce954eea 
As requested, here is the Django zsh completions alone without other cruft, such as 8e05d64
 2011-07-23 08:26:11 -07:00
Robby Russell dcab0cdc54 Merge pull request #483 from dreur/upstream-archlinux-plugin 
Fix typo in archlinux plugin
 2011-07-19 22:07:32 -07:00
Robby Russell c082174a4e Merge pull request #480 from PabloSerbo/master 
I've just read your coding standards and updated the code to match.
 2011-07-18 09:00:07 -07:00
Robby Russell d62f29b625 Merge pull request #479 from csexton/edit-command-line 
C-x C-e to edit current command in $EDITOR
 2011-07-18 07:57:54 -07:00
Robby Russell f951740656 Merge pull request #474 from PabloSerbo/master 
Adding a completion plugin for cake the coffee-script
 2011-07-17 22:09:47 -07:00
Robby Russell 4dce1d5d4a Merge pull request #476 from theunraveler/master 
Paths with spaces in upgrade script
 2011-07-17 22:09:24 -07:00
Robby Russell 202405e2b5 Merge pull request #452 from franklouwers/master 
chef "knife" plugin
 2011-07-17 22:07:10 -07:00
Robby Russell ca1ccde09f Merge pull request #468 from blinks/master 
Added a theme.
 2011-07-17 22:05:46 -07:00
Robby Russell ab6196430b Merge pull request #477 from totolici/patch-1 
redis-cli plugin: fixed typo for one of the subcommands
 2011-07-17 22:04:49 -07:00
Robby Russell bce9c3bb16 Merge pull request #404 from gwjo/ssh-agent 
ssh-agent improvements
 2011-07-17 22:03:39 -07:00
Robby Russell c80392475f Merge pull request #415 from eproxus/master 
New theme: sunrise
 2011-07-17 22:02:43 -07:00
Robby Russell 08711cd8f7 Merge pull request #475 from dreur/upstream-archlinux-plugin 
Added archlinux plugin
 2011-07-17 22:00:47 -07:00
Robby Russell 1eb52d4385 Merge pull request #370 from lepht/taskwarrior-plugin 
Taskwarrior plugin
 2011-07-15 08:26:43 -07:00
Robby Russell 9f099ddb83 Merge pull request #451 from matthewmccullough/cloudappplugin 
Added cloudapp from @holman of @GitHub fame
 2011-07-15 08:25:32 -07:00
Robby Russell 858ee947f3 Merge pull request #467 from papercavalier/bundler 
_run-with-bundler
 2011-07-15 08:24:38 -07:00
Robby Russell 9e601c23f1 Merge pull request #462 from papercavalier/bundler 
Bundler plugin consolidation
 2011-07-13 20:20:47 -07:00
Robby Russell 3552423de3 Merge pull request #429 from mhitza/master 
Optional themes
 2011-06-20 01:28:34 -07:00
Robby Russell 279cf279a6 Merge pull request #436 from smt/pull-request-1 
Add ohmyzsh theme, my version of dogenpunk
 2011-06-20 01:24:29 -07:00
Robby Russell ed990f61ff Merge pull request #400 from mkomitee/master 
Fix bug introduced in pull request #395 which impacts users who DISABLE_AUTO_UPDATE
 2011-06-05 01:04:30 -07:00
Robby Russell e8bd400bff Merge pull request #395 from vguerci/upgrade-before-init 
Upgrade before init
 2011-06-04 03:12:23 -07:00
Robby Russell 3ed19c4895 Merge pull request #371 from nebirhos/master 
Another (useless) theme!
 2011-06-03 08:50:31 -07:00
Robby Russell 3ddc49cafd Merge pull request #378 from secondplanet/master 
Humza.zsh-theme
 2011-06-03 08:50:07 -07:00
Robby Russell 30787d82bf Merge pull request #391 from mattdoran/master 
Fix typos in svn plugin
 2011-06-03 08:49:44 -07:00
Robby Russell 141d355e2e Merge pull request #385 from sunaku/theme 
add "sunaku" theme, see http://ompldr.org/vOHcwZg
 2011-06-02 08:50:33 -07:00
Robby Russell 3bb21afa88 Merge pull request #382 from miloshadzic/master 
miloshadzic theme
 2011-06-01 14:45:35 -07:00
Robby Russell 4b828cda28 Merge pull request #380 from brianjriddle/master 
fixes for ant plugin. tested on mac.
 2011-06-01 14:39:08 -07:00
Robby Russell 1f9b31ea34 Merge pull request #383 from alanpeabody/master 
My theme
 2011-06-01 14:05:12 -07:00
Robby Russell 7b0b83623f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-06-01 09:33:49 +02:00
Robby Russell 23a082df12 Revert "Added my zsh theme file, heavily based on sjl's" as it relies 
on a dotfile to be in ~/bin.

This reverts commit f2f34f5404.
 2011-06-01 09:33:12 +02:00
Robby Russell 643a4e77f6 Merge pull request #375 from betawaffle/rollback-366 
Rollback of Pull #366
 2011-05-31 21:24:01 -07:00
Robby Russell ba0f13604a Merge pull request #381 from thePapacy/fix-git-zsh 
Fix deleted in git.zsh
 2011-05-31 21:06:10 -07:00
Robby Russell 142c03dbd2 Merge pull request #359 from theunraveler/master 
Rewrite of plugin override
 2011-05-29 03:56:33 -07:00
Robby Russell d708f5ddc1 Merge pull request #363 from Blattlaus/master 
Ant plugin: stat command doesn't work under linux
 2011-05-29 03:54:40 -07:00
Robby Russell 40a737ee13 Merge pull request #366 from betawaffle/master 
Add/update plugins: brew, rvm, node, npm, pow, and thor.
 2011-05-29 03:54:05 -07:00
Robby Russell b0c9bc88ef Merge pull request #368 from trapd00r/master 
add trapd00r theme
 2011-05-29 03:49:51 -07:00
Robby Russell 0eba5364bf Merge pull request #365 from briankftse/master 
Added a new theme
 2011-05-29 03:49:27 -07:00
Robby Russell ab2a7b51a8 Merge pull request #345 from jacobat/master 
Autojump plugin
 2011-05-26 01:15:51 -07:00
Robby Russell 63db49cef6 Merge pull request #346 from jojahner/master 
My 'simple' theme.
 2011-05-26 01:14:16 -07:00
Robby Russell a81b0171cc Merge pull request #196 from asymmetric/master 
Add missing flag to unrar
 2011-05-26 01:13:18 -07:00
Robby Russell 4dd4bf84ed Merge pull request #226 from sunaku/fishy 
Fishy theme - better Git integration
 2011-05-26 01:10:26 -07:00
Robby Russell 54e475844a Merge pull request #139 from clauswitt/master 
Fixed an issue with the phing plugin
 2011-05-26 01:04:23 -07:00
Robby Russell 41dbf794ba Merge pull request #118 from fwalch/gpg-agent 
Added gpg-agent plugin
 2011-05-26 00:59:25 -07:00
Robby Russell bc00334be2 Merge pull request #92 from re5et/master 
added my zsh-theme
 2011-05-26 00:54:58 -07:00