Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-19 03:05:12 +02:00
Code Issues Releases Wiki Activity
955 Commits 5 Branches 0 Tags
b56e37201dd6cf00a667daa1f033cfb1b1669b4a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robby Russell b56e37201d Merge pull request #860 from sbfaulkner/rbenv-support-for-themes 
adding rbenv support to all the rvm themes
 2012-01-25 18:14:29 -08:00
Robby Russell 9dc9cae55f Merge pull request #865 from iltempo/patch-1 
Adding Engine Yard command (ey) to bundler binstubs
 2012-01-25 18:13:51 -08:00
Robby Russell ac910b85bd Merge pull request #845 from tjwallace/bundler_plugin_fix 
Fix bundler plugin for root level folders
 2012-01-22 13:11:39 -08:00
Robby Russell 80257bdf21 Merge pull request #717 from blueyed/github-plugin-working-hub 
github plugin: only alias git=hub if `hub --version` works.
 2012-01-22 13:11:08 -08:00
Robby Russell 3891c50923 Merge pull request #801 from kalos/autojump 
autojump plugin enhanced
 2012-01-22 13:09:59 -08:00
Robby Russell 3574f30d1a Merge pull request #811 from markdrago/remove_verbose_mercurial_flags 
remove the -v flag from a few mercurial aliases
 2012-01-22 13:01:54 -08:00
Robby Russell 634ce4ea1d Merge pull request #853 from lepht/master 
Updated to the latest taskwarrior completion definition (2.0b4)
 2012-01-22 13:01:17 -08:00
Robby Russell 98636331f6 Merge pull request #810 from cseeger/master 
Git Plugin: add 'grhh' alias for 'git reset HEAD --hard'
 2012-01-22 13:00:45 -08:00
Robby Russell 851aa9c96a Merge pull request #856 from sgharms/patch-1 
Grammar update
 2012-01-22 12:56:47 -08:00
Robby Russell c725ecc01b Merge pull request #858 from tatey/bundle_plugin_middleman 
Add middleman to bundled commands in bundler plugin
 2012-01-22 12:56:11 -08:00
Robby Russell f4944d5a95 Merge pull request #721 from gawel/master 
Just another alias for django
 2012-01-18 06:59:01 -08:00
Robby Russell 51ce4cd407 Merge pull request #783 from oteyatosys/master 
Mortal Scumbag Theme added
 2012-01-18 06:57:23 -08:00
Robby Russell 7cb5a5d406 Merge pull request #830 from dbye/speedup 
Removed calls to compinit in the extract and the bundler plugins.
 2012-01-18 06:56:12 -08:00
Robby Russell 6822296d71 Merge pull request #847 from msharp/master 
rake plugin
 2012-01-18 06:55:30 -08:00
Robby Russell 1a0be15d8c Merge pull request #840 from arbovm/master 
fixing #812: adding plugins w/o plugin.zsh file to fpath.
 2012-01-16 13:21:48 -08:00
Robby Russell eabd6fa303 Merge pull request #838 from Bounga/bundled_thor 
Add Thor to bundled commands
 2012-01-16 13:20:23 -08:00
Robby Russell dc45119ecc Merge pull request #833 from backspace/patch-1 
Don’t report that Oh My Zsh has been updated when it hasn’t.
 2012-01-16 12:53:52 -08:00
Robby Russell 7a41498b0d Merge pull request #784 from lnxbil/967e84ebaa180ad2ab1eebc9a512f94d93e84aea 
multiple version should also be highlighted
 2012-01-09 20:56:25 -08:00
Robby Russell b7b2dd5802 Merge pull request #806 from OutPunk/terminalapp-plugin 
Apple Terminal.app resume directory plugin
 2012-01-09 20:55:24 -08:00
Robby Russell a11c8142d3 Merge pull request #816 from lucapette/add-annotate-to-bundler-commands 
add annotate command to bundler
 2012-01-06 17:03:04 -08:00
Robby Russell 8c45b73918 Merge pull request #785 from simonjefford/patch-1 
bundler plugin - don't "bundle exec rails"
 2012-01-02 19:05:47 -08:00
Robby Russell 35de0e1e63 Merge pull request #799 from plindborg/ruby-plugin-fix 
Fixed the rfind command in the  ruby plugin
 2012-01-02 19:02:32 -08:00
Robby Russell 5516f8c42b Merge pull request #790 from cicloid/master 
Getting the hostname, correctly everywhere.
 2012-01-01 09:19:40 -08:00
Robby Russell 3e9493fb30 Merge pull request #679 from ornicar/official 
Add yaourt --sucre alias in archlinux plugin
 2011-12-26 10:45:53 -08:00
Robby Russell 6bab89a479 Merge pull request #671 from peterhoeg/31cddcd32427a5f5d3daa0da168d39aba5b510b4 
fix: rbenv plugin - gemset.
 2011-12-26 10:33:17 -08:00
Robby Russell 359fe53883 Merge pull request #688 from alexstrat/master 
Plugin : autocomplete for Jake
 2011-12-26 10:32:37 -08:00
Robby Russell ae3f5e4917 Merge pull request #693 from dreur/upstream-debian-apt-history 
Add apt-history function to debian plugin
 2011-12-26 10:31:41 -08:00
Robby Russell 22b99779d9 Merge pull request #702 from sirech/fix-bundle-compl 
Pull request #594 was not really correct
 2011-12-26 10:31:16 -08:00
Robby Russell 2864e421ea Merge pull request #710 from moutten/patch-1 
Add the --format tag to knife list commands
 2011-12-26 10:30:09 -08:00
Robby Russell 7c66c63463 Merge pull request #669 from peterhoeg/f/battery 
add: battery plugin
 2011-12-26 10:29:14 -08:00
Robby Russell 8bc60824f6 Merge pull request #618 from fceccon/custom-theme 
Use a custom version of a theme if the user has it
 2011-12-26 10:23:53 -08:00
Robby Russell 480d1247b8 Updating installation documentation to show a curl example as well for those who don't have wget installed. 2011-12-26 10:15:35 -08:00
Robby Russell c41807c82f Merge pull request #776 from mytechnix/master 
Added examples aliases in ZSH config template and new theme.
 2011-12-26 10:09:09 -08:00
Robby Russell 0407eb000f Merge pull request #747 from ilikenwf/1a49f6443c0230b8e182294546ed9ef2a5110bf2 
Add sprunge.us uploader - uses files, pipes, etc and posts to a minimalistic pastebin
 2011-12-26 10:06:55 -08:00
Robby Russell b29602e661 Merge pull request #764 from Fl4t/submodules 
Ignore submodules dirty in prompt info
 2011-12-26 10:05:51 -08:00
Robby Russell 2b86624951 Merge pull request #772 from indrajitr/master 
Fix upgrade and uninstall functions to pick up $ZSH value
 2011-12-26 10:04:59 -08:00
Robby Russell 723372a103 Merge pull request #765 from trevor/master 
add note about custom plugins
 2011-12-26 10:04:04 -08:00
Robby Russell 8af3a9af56 Merge pull request #768 from askreet/master 
global ssh_known_hosts file
 2011-12-26 10:02:59 -08:00
Robby Russell f8db2e88e5 Merge pull request #769 from divineforest/master 
Added alias gcm='git checkout master
 2011-12-26 10:02:09 -08:00
Robby Russell 0ca2e26e16 Merge pull request #775 from tatey/sammy_black_on_white_theme 
Black on white theme
 2011-12-26 09:58:55 -08:00
Robby Russell 54f17588b3 Merge pull request #752 from andrewtch/symfony2-completion 
Symfony 2 completion
 2011-12-19 13:56:48 -08:00
Robby Russell 8c96fa3ec6 Merge pull request #757 from cwjohnston/knife-environments 
Add support for chef environments in knife plugin
 2011-12-19 13:55:40 -08:00
Robby Russell 8ca8d2661c Merge pull request #759 from Zhann/master 
show gem set next to ruby version
 2011-12-19 13:55:10 -08:00
Robby Russell 82568cc7e6 Merge pull request #708 from eatnumber1/update-print 
Use printf rather than echo -e in update.sh
 2011-12-16 11:04:34 -08:00
Robby Russell c133f41833 Merge pull request #343 from giddie/plugin-wakeonlan 
Plugin to make WOL nice & easy
 2011-12-14 22:09:51 -08:00
Robby Russell 047fcdc2cb Merge pull request #743 from c089/autojump-macports 
add support for autojump installed via macports
 2011-12-14 22:04:11 -08:00
Robby Russell 220eccf0a9 Merge pull request #741 from suvash/master 
Added my own theme for submission
 2011-12-14 22:03:27 -08:00
Robby Russell 9637d4ec22 Merge pull request #738 from pygatea/master 
Adds pygmalion.zsh_theme
 2011-12-14 22:02:24 -08:00
Robby Russell e711ab84cc Merge pull request #733 from Zhann/master 
Pull request for zhann theme
 2011-12-14 22:01:33 -08:00
Robby Russell d1b6423f2f Merge pull request #732 from ggustafsson/patch-1 
Removed duplicate setting and sorted the remaining
 2011-12-14 21:59:37 -08:00
Robby Russell e25147a3af Merge pull request #734 from maxpersson/726-pip-completion 
Added brute force package completion to pip plugin
 2011-12-14 21:59:14 -08:00
Robby Russell 11b4769085 Merge pull request #709 from docwhat/custom-plugin-fpath 
set fpath correctly for custom plugins
 2011-12-14 21:56:45 -08:00
Robby Russell ca21ff16da Merge pull request #707 from gmcmillan/master 
Allow user to disable update prompt
 2011-12-14 21:54:14 -08:00
Robby Russell a9a0f58009 Merge pull request #706 from docwhat/termsupport-hook 
lib/termsupport now uses add-zsh-hook
 2011-12-14 21:52:42 -08:00
Robby Russell d3cc18499d Merge pull request #701 from kirs/master 
Rails Migrations support in Rails3 plugin
 2011-12-14 21:51:21 -08:00
Robby Russell 91926dc80a Merge pull request #553 from benlumley/master 
Improvement to gallois theme
 2011-12-14 21:48:27 -08:00
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