Commit Graph
100 Commits
Author SHA1 Message Date
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
Robby Russell e2cd26c72e Merge branch 'joerc' of https://github.com/sargas/oh-my-zsh into sargas-joerc 2010-11-19 10:48:07 -08:00
Robby Russell 8bda5d185a Merge branch 'master' of https://github.com/Bira/oh-my-zsh into Bira-master 2010-11-19 10:42:55 -08:00
Robby Russell 580eda4dca Merge branch 'master' of https://github.com/FedyashevNikita/oh-my-zsh into FedyashevNikita-master 2010-11-19 10:41:11 -08:00
Robby Russell df126ef5ba Merge branch 'master' of http://github.com/svnlto/oh-my-zsh into svnlto-master 2010-10-09 10:06:49 -07:00
Robby Russell d1c8ef46e0 Merge branch 'master' of http://github.com/philtr/oh-my-zsh into philtr-master 2010-10-09 09:58:20 -07:00
Robby Russell 69e611e2a9 Merge branch 'philips-theme' of http://github.com/philips/oh-my-zsh into philips-philips-theme 2010-10-09 09:57:37 -07:00
Robby Russell 7ab4d30fe1 Merge branch 'title-fix' of http://github.com/philips/oh-my-zsh into philips-title-fix 2010-10-09 09:55:52 -07:00
Robby Russell 26d97a9355 Reorganizing plugins so that each plugin has it's own directory now so that any plugin-specific functions can be bundled within there. 2010-09-30 21:34:06 -07:00
Robby Russell 7a09175bb4 Merge branch 'master' of http://github.com/kennethreitz/oh-my-zsh into kennethreitz-master 2010-09-30 21:04:59 -07:00
Robby Russell 59a83e8b7b Merge branch 'master' of http://github.com/vivekprahlad/oh-my-zsh into vivekprahlad-master 2010-09-30 21:04:22 -07:00
Robby Russell 88293b305a Merge branch 'dirpersist' of http://github.com/curiousstranger/oh-my-zsh into curiousstranger-dirpersist 2010-09-30 21:01:57 -07:00
Robby Russell d647a9b25c Tidying up the spacing to bring in line with coding standards 2010-09-30 20:54:45 -07:00
Robby Russell 321f5ef359 Merge branch 'ssh-agent' of http://github.com/gwjo/oh-my-zsh into gwjo-ssh-agent 2010-09-30 20:53:19 -07:00
Robby Russell c9c65bf7fc Merge branch 'theunraveler_theme' of http://github.com/theunraveler/oh-my-zsh into theunraveler-theunraveler_theme 2010-09-30 20:50:43 -07:00
Robby Russell 36c05fbe8d Merge branch 'named_dirs_completion' of http://github.com/kremso/oh-my-zsh into kremso-named_dirs_completion 2010-09-30 20:50:00 -07:00
Robby Russell 6104e59c8d Merge branch 'shifttab' of http://github.com/kremso/oh-my-zsh into kremso-shifttab 2010-09-30 20:48:10 -07:00
Robby Russell 99f159e0a7 Removing '.' alias as it is overwriting a bash/zsh feature. Closes #63 2010-08-24 11:08:20 -07:00
Robby Russell ed90f182ef Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2010-08-19 08:04:26 -07:00
Robby Russell aeabc3f616 Switching to /usr/bin/env zsh instead of /bin/zsh in the installer 2010-08-19 08:04:18 -07:00
Robby Russell 622ee4ceb2 Merge branch 'master' of http://github.com/AlexBio/oh-my-zsh into AlexBio/master 2010-08-19 07:20:00 -07:00
Robby Russell 7c279856ed Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2010-06-10 07:50:24 -07:00
Robby Russell 7f350da5b7 Adding a ggpnp which does a git pull followed by a git push. 2010-06-10 07:50:13 -07:00
Robby Russell fca8b7e3e6 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2010-06-03 21:27:38 -07:00
Robby Russell 59bfd87e08 Adding some candy to the upgrade script 2010-06-03 13:01:41 -07:00
Robby Russell dea166411f Moving brew functions to it's own plugin 2010-06-03 12:59:49 -07:00
Robby Russell 27904c117c Moving current_branch() to git plugin 2010-06-03 12:56:11 -07:00
Robby Russell 89bd2bf317 Moving some rails and osx-specific functions to their corresponding plugin files 2010-06-03 12:55:07 -07:00
Robby Russell 455669e976 Removing legacy completion code 2010-06-03 12:54:40 -07:00
Robby Russell ab2c0744ab Removing rake completion from lib/ as it was moved to rails plugin 2010-06-03 12:33:15 -07:00
Robby Russell c21d3775a9 Moving capistrano functions to rails plugin 2010-06-03 12:32:55 -07:00
Robby Russell 31dace8829 Updating default .zshrc template file to include plugins declaration 2010-06-03 12:05:12 -07:00
Robby Russell 3cf9ab722e Initial implementation of a new plugin system, so that people can managed which aliases/functions they want. 2010-06-03 12:03:26 -07:00
Robby Russell 5a3bde78d8 Sprinkling some candy on this muffin. 2010-05-07 15:35:03 -07:00
Robby Russell 86d0cd380d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2010-05-07 13:20:38 -07:00
Robby Russell 19ead08382 Merge remote branch 'NV/master' 2010-05-07 13:20:30 -07:00
Robby Russell 7a9d4ceb75 Merge remote branch 'jreese/master' 2010-05-07 13:16:50 -07:00
Robby Russell 7d036913c4 Unsetting config_file after loading config 2010-05-06 21:13:59 -07:00
Robby Russell 447da5816e Removing rake autocompletion as this is apparently baked into recent versions of zsh 2010-05-06 21:04:09 -07:00
Robby Russell 2ecc228b23 Adding a function that will open up a ticket in Lighthouse based on the number and there being a URL in a hidden file. 2009-12-16 11:23:41 -08:00
Robby Russell 98d56a3097 Adding a nocorrect for the heroku command as it was getting triggered by heroku logs. 2009-12-13 11:48:03 -08:00
Robby Russell 4419c5c347 Merge commit 'e429ff9e2bed41f88e3df3315b159fa79a7152fc' 2009-12-12 14:10:05 -08:00
Robby Russell c08e1e0ca0 Merge branch 'master' of git://github.com/macovsky/oh-my-zsh into macovsky/master 2009-12-12 13:52:55 -08:00
Robby Russell 41f13ccb0a Updating check_for_upgrade script to fix issue when the LAST_EPOCH file/value got corrupted. Closes #32 2009-12-12 13:45:30 -08:00
Robby Russell 473dd3b212 Adding current_branch function, which can be used like: git pull origin master 2009-11-25 12:45:16 -08:00
Robby Russell c620408962 Revert "Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed)."
This reverts commit 14a1ce80bb.
2009-11-09 07:33:51 -08:00
Robby Russell 5c13930832 Revert "Whoops, forgot to include this dummy precmd implementation."
This reverts commit a21525ba0c.
2009-11-09 07:33:38 -08:00
Robby Russell fc3a3c72b1 Only using the contents of .ssh/known_hosts when the file exists for ssh/scp auto-completion. Closes issue #20 2009-11-08 15:34:02 -08:00
Robby Russell eb05b61483 Removing gdb alias as it conflicts with an actual command for gdb. Closes #17 2009-11-08 15:27:17 -08:00
Robby Russell 286559d180 Revert "Fixed issue #19 'Rake not auto completing'. The stat command syntax that was being used was not correct. Or at least on my machine. See man page for the stat command"
This reverts commit 83907294d6.
2009-11-08 15:24:20 -08:00
Robby Russell 83309294df Adding devlog alias for tailing development.log for Rails 2009-11-01 14:23:03 -08:00
Robby Russell fd6861b8cd Fixing some conflict residue that I missed in a commit/merge: 2009-10-26 09:24:37 -07:00
Robby Russell 11220ca495 Merge branch 'master' of git://github.com/kastner/oh-my-zsh into kastner/master 2009-10-26 09:21:16 -07:00
Robby Russell 5fe112eb4b Merge branch 'master' of git://github.com/mrinterweb/oh-my-zsh into mrinterweb/master 2009-10-26 09:19:24 -07:00
Robby Russell 58bccaf6fc Fixing merge conflicts 886d97f41e 2009-10-26 09:16:19 -07:00
Robby Russell 52f5eb2005 Merging conflict. 788c9af056 2009-10-26 09:09:00 -07:00
Robby Russell 56693663ad Merge branch 'master' of git://github.com/mdonoughe/oh-my-zsh into mdonoughe/master 2009-10-26 08:57:29 -07:00
Robby Russell c03aab5164 Renaming script/server --debug alias to ssd to avoid conflict. Closes #1 2009-10-12 19:13:52 -07:00
Robby Russell a175f35bde Merge branch 'master' of git://github.com/wezm/oh-my-zsh into wezm/master 2009-10-11 13:52:40 -07:00
Robby Russell 2f89c54019 Merge branch 'cypher/master' 2009-10-11 13:42:14 -07:00
Robby Russell 2289cacecb Merge branch 'master' of git://github.com/cypher/oh-my-zsh into cypher/master 2009-10-06 05:15:55 -07:00
Robby Russell 00a190bc01 Oh My Zsh gets a weekly auto-updater... the future is now! 2009-09-23 17:12:19 -07:00
Robby Russell 700a3f0bad Adding a script to check for upgrades 2009-09-23 17:11:45 -07:00
Robby Russell ff545e6934 Bumping up history to 10k commands 2009-09-23 08:07:02 -07:00
Robby Russell 1dc7353732 Updating README to mention custom/ directory 2009-09-23 08:06:32 -07:00
Robby Russell 19a08f15d6 not ignoring example.zsh 2009-09-23 08:05:05 -07:00
Robby Russell ef9ce1e221 Updating .gitignore to ignore everything but the example.zsh file in custom/ 2009-09-23 08:03:38 -07:00
Robby Russell 107322c2e8 Moving some example files into custom/ 2009-09-23 08:02:58 -07:00
Robby Russell 8debd097fb Moving all zsh config options into a lib/ subdirectory to make way for some upcoming changes to directory structure and configuration options 2009-09-23 07:43:36 -07:00
Robby Russell 2759586aae Using compctl instead of compdef to resolve Issue #1 2009-09-22 20:36:28 -07:00
Robby Russell 8692512106 Updating the name of the rake and capistrano task cache file to append a ~ to the end of the filename so it's easier to ignore in rails git projects. [#1] 2009-09-07 09:18:40 -07:00
Robby Russell b67961d812 Updating install process to copy your current environments PATH and adding it to the bottom of ~/.zshrc. 2009-09-07 09:11:34 -07:00
Robby Russell 44465ef4ce Merge branch 'master' of git://github.com/mwilliams/oh-my-zsh into mwilliams/master 2009-09-06 09:43:54 -07:00
Robby Russell 71c59eaf85 Moving bindings into their own file. Updating aliases after moving out bindings 2009-09-01 20:46:48 -07:00
Robby Russell 1978c04daa Trying out some zsh-fu. Using the for x (*.zsh) source approach 2009-09-01 20:34:58 -07:00
Robby Russell d1a9efc4e2 Updating README to instruct people to copy the .zshrc template file versus symlinking it. 2009-09-01 07:52:43 -07:00