Commit Graph
100 Commits
Author SHA1 Message Date
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
Robby Russell 22ae70f79d Merge pull request #90 from steeef/steeef-theme
Steeef theme
2011-05-26 00:52:57 -07:00
Robby Russell f9e2af2bd7 Merge pull request #351 from GutenLinux/master
add custom completion support
2011-05-25 12:55:41 -07:00
Robby Russell a57ffbed85 Merge pull request #347 from obcode/master
obraun theme
2011-05-25 12:55:11 -07:00
Robby Russell 542415b922 Merge pull request #355 from watsoncj/master^1
Fix to Random Theme Selection
2011-05-25 12:52:43 -07:00
Robby Russell 2440954f06 Merge pull request #224 from Soliah/plugin-rvm
RVM Plugin
2011-05-24 03:01:49 -07:00
Robby Russell 7c3d12c7de Merge pull request #295 from alexrinass/apache2-macports-plugin
Added start/stop aliases for Apache 2 installation via macports.
2011-05-13 02:53:02 -07:00
Robby Russell d275440219 Merge pull request #290 from arthurkalm/delete-key-working
Make the delete key work correctly, instead of outputting a ~
2011-05-13 02:52:25 -07:00
Robby Russell 396dc787af Merge pull request #322 from jonashuckestein/master
jispwoso theme
2011-05-13 02:51:03 -07:00
Robby Russell 4a497b021c Merge pull request #324 from sorin-ionescu/plugin-compleat
Compleat - Completion for Human Beings Plugin
2011-05-13 02:50:43 -07:00
Robby Russell 4f71818a8b Merge pull request #329 from juanghurtado/master
Support for $(current_branch) on git_parse_ahead()
2011-05-13 02:48:50 -07:00
Robby Russell 7958e54aaf Merge pull request #330 from jtriley/jtriley-theme
update to jtriley-theme
2011-05-13 02:48:13 -07:00
Robby Russell 0365ef0529 Merge pull request #321 from nel/fix-window-title-regex.
Relax pattern matching on TERM. Closes #320.
2011-05-02 04:56:59 -07:00
Robby Russell 66b7fe1b27 Merge pull request #314 from mattsacks/master.
Add Muse theme for 256 color terminals
2011-05-01 03:02:57 -07:00
Robby Russell a525993f6b Merged pull request #315 from nebirhos/master.
Fixies auto update (2nd try)
2011-04-29 10:33:21 -07:00
Robby Russell 784c56cd09 Merged pull request #312 from juanghurtado/master.
Personal theme: juanghurtado.zsh-theme
2011-04-29 04:48:37 -07:00
Robby Russell f3e162c3e6 Merged pull request #310 from Ikke/master.
Add git-flow plugin
2011-04-29 03:38:41 -07:00
Robby Russell e34b61fdd2 Merged pull request #270 from sankara/d03a6176aacd583993c02c7e837d10751c431875.
Basic autocompletion for Leiningen (fixed pull request)
2011-04-29 03:36:09 -07:00
Robby Russell 1c33f719b9 Merged pull request #311 from papercavalier/rails3.
Rails 3 aliases now work with Rails 2 as well.
2011-04-29 03:33:52 -07:00
Robby Russell c8ac3356c8 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-04-29 11:24:51 +02:00
Robby Russell 6f7d51c68d Feature: Random themes now supported. Just set your theme to 'random' and it'll load a different theme each time oh-my-zsh is started. Closes #309 2011-04-29 11:24:29 +02:00
Robby Russell 17eba9e46c Merged pull request #308 from juanghurtado/master.
New prompt methods on Git lib file
2011-04-29 01:54:59 -07:00
Robby Russell a89d33c060 Merged pull request #307 from jtriley/jtriley-theme.
add my custom zsh prompt
2011-04-28 23:36:49 -07:00
Robby Russell 58413bc0f5 Merged pull request #302 from JonathanTron/5bcfab37312511a7ffc3e8242ba8b8a622ecf061.
New theme second try
2011-04-28 23:29:55 -07:00
Robby Russell ed5f85c145 Merged pull request #303 from cit/master.
added alias for apt-cache search to deb plugin
2011-04-28 23:29:17 -07:00
Robby Russell b8f8cd46a4 Merged pull request #299 from atmos/master.
Support non-standard rvm install prefixes in bira
2011-04-28 23:28:06 -07:00
Robby Russell c550f1f844 Merged pull request #269 from oknowton/master.
Significantly speed up startup time (1.2 seconds for me) by removing redundant compinit calls
2011-04-28 23:24:39 -07:00
Robby Russell 70d0beae22 Merged pull request #138 from murilasso/master.
Added my theme
2011-04-26 10:05:48 -07:00
Robby Russell bc3a8d295c Merged pull request #276 from saimn/yum.
new yum plugin with useful aliases
2011-04-26 10:04:38 -07:00
Robby Russell 0f9c67bdb2 Merged pull request #278 from totolici/redis-plugin.
Redis-cli plugin
2011-04-26 09:50:39 -07:00
Robby Russell 58b3e21a83 Merged pull request #288 from dogenpunk/dogenpunk_theme.
Adding dogenpunk theme
2011-04-26 09:48:49 -07:00
Robby Russell ffbc013627 Merged pull request #287 from arthurkalm/install-tweeks.
Install tweeks
2011-04-26 09:47:56 -07:00
Robby Russell 5f0e585e5b Merged pull request #294 from alexrinass/mysql-macports-plugin.
Fixed folder naming for mysql-macports plugin and improved start/stop scr
2011-04-26 09:46:18 -07:00
Robby Russell 55a5b3e7dc Merged pull request #297 from Soliah/master.
Updated my theme.
2011-04-26 09:45:48 -07:00
Robby Russell 69895813c2 Merged pull request #298 from wolverian/master.
Update brew autocompletion
2011-04-26 09:45:27 -07:00
Robby Russell 79cf05326d Merged pull request #300 from gallois/master.
Added a custom theme, based on eastwood
2011-04-26 09:44:32 -07:00
Robby Russell b6be2889aa Merge branch 'friskTheme' of https://github.com/Nycto/oh-my-zsh 2011-04-12 10:40:11 +02:00
Robby Russell 849e2834fb Updating the README... now links to contributors page 2011-04-12 10:36:45 +02:00
Robby Russell 8883ace767 Revert "Enable alias completion, do not limit completion to just files"
This reverts commit c3a58b0004.
2011-04-12 10:24:06 +02:00
Robby Russell b3a78d2b28 Using git-diff instead of git diff 2011-04-12 10:19:15 +02:00
Robby Russell d11fb9d47c Removing call to mate. 2011-04-12 10:16:32 +02:00
Robby Russell 05fc020a08 Merge branch 'disable_auto-title' of https://github.com/lorrin/oh-my-zsh into lorrin-disable_auto-title 2011-04-03 11:00:38 -07:00
Robby Russell 52df85440e Revert "Re-order title/tab setting to make window titles work on OSX terminal which"
Was causing iTerm title to disappear entirely..

This reverts commit d4ea399b04.
2011-03-16 12:20:35 -07:00
Robby Russell 23556491e6 Merge branch 'ssh-agent-append-host-to-environment' of https://github.com/trcjr/oh-my-zsh into trcjr-ssh-agent-append-host-to-environment 2011-03-16 08:05:19 -07:00
Robby Russell bb3414ec00 Merge branch 'master' of https://github.com/AlexBio/oh-my-zsh into AlexBio-master 2011-03-16 08:03:23 -07:00
Robby Russell fce2733fe9 Merge branch 'osx-terminal-title' of https://github.com/curiousstranger/oh-my-zsh into curiousstranger-osx-terminal-title 2011-03-16 08:01:29 -07:00
Robby Russell bafa8cd980 Merge branch 'master' of https://github.com/dbbolton/oh-my-zsh into dbbolton-master 2011-03-16 07:59:18 -07:00
Robby Russell af23a48a19 Merge branch 'feature/alias-completion' of https://github.com/shadowhand/oh-my-zsh into shadowhand-feature/alias-completion 2011-03-16 07:57:01 -07:00
Robby Russell 23588889a7 Merge branch 'master' of https://github.com/tjkirch/oh-my-zsh into tjkirch-master 2011-03-16 07:55:25 -07:00
Robby Russell 746a10368a Merge branch 'master' of https://github.com/myronmarston/oh-my-zsh into myronmarston-master 2011-02-21 22:05:56 -08:00
Robby Russell 4ef3bb4847 Merge branch 'refactor-term' of https://github.com/nel/oh-my-zsh into nel-refactor-term 2011-02-21 22:00:05 -08:00
Robby Russell 4378d85934 Merge branch 'master' of https://github.com/medwezys/oh-my-zsh into medwezys-master 2011-02-21 21:57:03 -08:00
Robby Russell d1d14e6ea6 Merge branch 'osx' of https://github.com/benlangfeld/oh-my-zsh into benlangfeld-osx 2011-02-21 21:55:27 -08:00
Robby Russell aca392bebd Merge branch 'master' of https://github.com/Soliah/oh-my-zsh into Soliah-master 2011-02-21 21:52:12 -08:00
Robby Russell 6a3f406468 Merge branch 'lib-git' of https://github.com/sorin-ionescu/oh-my-zsh into sorin-ionescu-lib-git 2011-02-21 21:50:36 -08:00
Robby Russell 6235467421 Merge branch 'master' of https://github.com/nanotech/oh-my-zsh into nanotech-master 2011-02-21 21:49:05 -08:00
Robby Russell 9d941d0544 Merge branch 'theme-sorin' of https://github.com/sorin-ionescu/oh-my-zsh into sorin-ionescu-theme-sorin 2011-02-21 21:47:26 -08:00
Robby Russell 9ddff75972 Merge branch 'master' of https://github.com/Nemo157/oh-my-zsh into Nemo157-master 2011-02-21 21:46:26 -08:00
Robby Russell 452eeed890 Merge branch 'nicoulaj-theme' of https://github.com/nicoulaj/oh-my-zsh into nicoulaj-nicoulaj-theme 2011-02-21 21:45:00 -08:00
Robby Russell 01b0366f3e Merge branch 'master' of https://github.com/theunraveler/oh-my-zsh into theunraveler-master 2011-01-15 01:18:08 -08:00
Robby Russell f02e732543 Merge branch 'master' of https://github.com/SuprDewd/oh-my-zsh into SuprDewd-master 2011-01-15 01:17:29 -08:00
Robby Russell 8da8d45236 Merge branch 'postpone-theme-sourcing' of https://github.com/mkomitee/oh-my-zsh into mkomitee-postpone-theme-sourcing 2011-01-15 01:10:23 -08:00
Robby Russell 76d9905584 Merge branch 'master' of https://github.com/Rixius/oh-my-zsh into Rixius-master 2011-01-14 06:54:49 -08:00
Robby Russell c3224900b7 Merge branch 'dieter-theme' of https://github.com/Dieterbe/oh-my-zsh into Dieterbe-dieter-theme 2011-01-14 06:46:42 -08:00
Robby Russell e46eb7016a Merge branch 'typo' of https://github.com/papercavalier/oh-my-zsh into papercavalier-typo 2011-01-14 06:43:49 -08:00
Robby Russell 192ea1424a Merge branch 'master' of https://github.com/sunaku/oh-my-zsh 2011-01-14 06:40:09 -08:00
Robby Russell 7bf6adcd48 Merge branch 'master' of https://github.com/dannytatom/oh-my-zsh into dannytatom-master 2011-01-14 06:38:27 -08:00
Robby Russell 552b66fed9 Merge branch 'master' of https://github.com/flazz/oh-my-zsh into flazz-master 2011-01-14 06:36:45 -08:00
Robby Russell 7a9cc19819 Merge branch 'git' of https://github.com/papercavalier/oh-my-zsh into papercavalier-git 2011-01-08 11:33:14 -08:00
Robby Russell 31bfb61290 Merge branch 'master' of https://github.com/derekprior/oh-my-zsh into derekprior-master 2011-01-08 11:31:32 -08:00
Robby Russell 55bcf23512 Merge branch 'rails3' of https://github.com/papercavalier/oh-my-zsh into papercavalier-rails3 2011-01-08 11:25:58 -08:00
Robby Russell 4fadc30247 Merge branch 'kardan' of https://github.com/kardan/oh-my-zsh into kardan-kardan 2010-12-07 08:08:22 -08:00
Robby Russell 583c984a86 Merge branch 'fix-lighthouse-error-message' of https://github.com/mortice/oh-my-zsh into mortice-fix-lighthouse-error-message 2010-11-19 10:53:39 -08:00
Robby Russell c517f58599 Merge branch 'completions' of https://github.com/gwjo/oh-my-zsh into gwjo-completions 2010-11-19 10:49:30 -08:00