Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-16 09:49:03 +02:00
Code Issues Releases Wiki Activity
1,106 Commits 5 Branches 0 Tags
921d2f49ef01acce973980c0aa9c6ffbbd2fbd0b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robby Russell 921d2f49ef Merge pull request #1228 from clutt0n/master 
Small improving themes/jnrowe.zsh-theme
 2012-09-01 08:33:09 -07:00
Robby Russell c27183abcd Merge pull request #1287 from johnhamelink/master 
Laravel autocompletion
 2012-09-01 08:31:52 -07:00
Robby Russell a0430a0a45 Merge pull request #1279 from 3den/master 
My favourite theme with support to RVM and GIT
 2012-09-01 08:31:04 -07:00
Robby Russell 633ad0ec16 Merge pull request #1297 from everbird/master 
supervisor plugin
 2012-09-01 08:29:01 -07:00
Robby Russell d05b2010ff Merge pull request #1229 from seban/run_rails_without_bundle_exec 
'rails' command should not be run with bundle exec
 2012-07-20 15:15:05 -07:00
Robby Russell 1c23a52f57 auto-upadate feature will now reset the epoch so that if a user doesn't say yes, it won't ask them again for a while. fixes #1240 2012-07-20 15:07:51 -07:00
Robby Russell 11034217a7 Merge pull request #1200 from andyfleming/master 
New theme af-magic.zsh-theme
 2012-07-11 16:52:33 -07:00
Robby Russell 11f441a3ac Merge pull request #1206 from Eustachy/upstream 
Remove bogus "-" from nomz="ps -aux" alias.
 2012-07-09 19:36:53 -07:00
Robby Russell ddafaf65fb Merge pull request #1216 from joshvermaire/patch-1 
Escape whitespace for Sublime Text plugin
 2012-07-09 19:34:03 -07:00
Robby Russell 0370de582b Merge pull request #1122 from varunkvv/master 
sublime pluginn : Added alias for Sublime Text 2 on Linux
 2012-07-03 06:28:36 -07:00
Robby Russell 76feafc72c Merge pull request #1127 from a-b/master 
Added fasd plugin
 2012-07-03 06:28:02 -07:00
Robby Russell e5ca18a4e2 Merge pull request #1193 from bameda/master 
[Plugin] Virtualenvwrapper: Added another path
 2012-07-03 06:27:31 -07:00
Robby Russell f3bcf864b2 Merge pull request #1209 from lwe/rbfu-plugin 
provide plugin for rbfu (yet ruby version switcher)
 2012-07-03 06:26:24 -07:00
Robby Russell beadefcfb0 Merge pull request #1170 from dipth/master 
Explicitly tell rbenv to use zsh
 2012-07-03 06:25:53 -07:00
Robby Russell d165a84dc0 Merge pull request #1190 from vpacher/master 
added jruby plugin
 2012-06-24 12:36:15 -07:00
Robby Russell 1425ffe85c Merge pull request #1192 from rcakirerk/a39c9ffe5b7236b6e4dc78efa80b478cc411af7f 
Fix finding git issue.
 2012-06-24 12:35:48 -07:00
Robby Russell 3ac3141cd6 Merge pull request #1174 from insside/rbenv-homebrew-fix 
rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
 2012-06-22 06:39:28 -07:00
Robby Russell 493238e29b Merge pull request #1126 from natsumesou/fix-ignore-symlink 
Load symlink custom files
 2012-06-22 06:38:41 -07:00
Robby Russell a2695630cd Merge pull request #1182 from jugyo/patch-1 
correct the ruby version label of the 'nebirhos' theme for rbenv
 2012-06-22 06:37:23 -07:00
Robby Russell bf98a2d68b Merge pull request #1159 from kristi/master 
Steef theme - Improved git untracked file detection
 2012-06-22 06:36:58 -07:00
Robby Russell 470e1a1ecf Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix 
Readlink is different on OS X
 2012-06-22 06:35:49 -07:00
Robby Russell 17c77ee20a Merge pull request #1168 from r-darwish/yum-plugin-fix 
Fixed unmached " in yum plugin
 2012-06-22 06:33:51 -07:00
Robby Russell e8d582aba9 Merge pull request #977 from scialex/better-d 
Make the 'd' alias only show the directories that can be cd'd to using the number aliases.
 2012-06-13 13:25:00 -07:00
Robby Russell e3d426dc6d Merge pull request #980 from vmalloc/dircycle_plugin 
Add dircycle plugin: enables cycling through the directory stack
 2012-06-13 13:24:13 -07:00
Robby Russell 38d537f9e7 Merge pull request #984 from vmalloc/less_r_pager 
Pager is 'less -R' to support colored outputs
 2012-06-13 13:22:33 -07:00
Robby Russell b84d336672 Merge pull request #985 from pomaxa/master 
git plugin function
 2012-06-13 13:21:13 -07:00
Robby Russell f60244f8f4 Merge pull request #999 from ChaosData/master 
Auto title now disabled in emacs term mode
 2012-06-13 13:20:42 -07:00
Robby Russell 7bb2744873 Merge pull request #1016 from fuksito/master 
Helpers for encoding/decoding base64
 2012-06-13 13:19:07 -07:00
Robby Russell edc8b1e2cc Merge pull request #1032 from r-darwish/suse 
Added suse plugin
 2012-06-13 13:18:37 -07:00
Robby Russell 7d9ae4cdb1 Merge pull request #1055 from daniellockard/patch-1 
Added an if-statement to see if git is installed
 2012-06-13 13:17:24 -07:00
Robby Russell d297524bf5 Merge pull request #1065 from ntpeters/patch-1 
Added more aliases for yum
 2012-06-13 13:15:15 -07:00
Robby Russell 00c8e332a2 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-06-13 13:14:28 -07:00
Robby Russell 4199c1a6f7 Updating README to ask people to stop sending themes for now 2012-06-13 13:14:23 -07:00
Robby Russell 33b7f22628 Merge pull request #1148 from erichmenge/git-flow-plugin 
Add a couple of options for git-flow.
 2012-06-13 13:11:36 -07:00
Robby Russell e6c81a5893 Merge pull request #1019 from matschaffer/patch-1 
Don't clobber standard Esc+. behavior
 2012-06-13 13:09:45 -07:00
Robby Russell feb11a71ae Merge pull request #239 from fred-o/master 
Maven and GNU Screen plugins
 2012-06-13 12:34:02 -07:00
Robby Russell 21de917d3b Merge pull request #1146 from westonplatter/master 
[rails3 plugin], add, rgm = rails generate migration
 2012-06-13 12:30:40 -07:00
Robby Russell 2946630aa3 Merge pull request #1152 from mispy/virtualenvwrapper 
Plugin for Python's virtualenvwrapper
 2012-06-13 12:30:06 -07:00
Robby Russell 577d8a9a7c Merge pull request #1155 from s3dev/s3dev 
Change hardcoded ~/.oh-my-zsh to $ZSH.
 2012-06-13 12:27:30 -07:00
Robby Russell c669868486 Merge pull request #1145 from tjl2/master 
Removing 'ey' from bundled_commands
 2012-06-13 12:26:50 -07:00
Robby Russell 57279ecd55 Merge pull request #1156 from thackoun/master 
very small beug in the terminalparty theme
 2012-06-13 12:23:40 -07:00
Robby Russell caa15548c1 Merge pull request #1138 from amarraja/master 
Remove heroku from the bundler plugin
 2012-05-31 10:02:50 -07:00
Robby Russell 48c9e77f53 Merge pull request #1140 from mappleconfusers/pull_req_debian 
Enhancements for the Debian Plugin
 2012-05-31 09:55:39 -07:00
Robby Russell 91b4758d8f Now with 50% less auto-updates. 2012-05-31 09:52:53 -07:00
Robby Russell 3fdaf26006 Merge pull request #1026 from dir01/patch-1 
Python plugin: added pygrep command, simplified pyclean
 2012-05-20 19:48:31 -07:00
Robby Russell 383ee71831 Merge pull request #1079 from dylnhdsn/feature/sublime_text_plugin 
added aliases for sublime text
 2012-05-20 19:47:16 -07:00
Robby Russell a36a90b932 Merge pull request #1105 from Drarok/fix-svn 
Fix the svn plugin only outputting the 1st path segment
 2012-05-20 19:46:11 -07:00
Robby Russell e6fc2c6748 Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable 
Fix $ZSH_CUSTOM variable
 2012-05-20 19:45:12 -07:00
Robby Russell 512a6e54a3 Merge pull request #850 from johnantoni/pow-fix 
take in chris sexton's changes to the pow plugin
 2012-01-25 18:15:16 -08:00
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