Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-21 12:15:18 +02:00
Code Issues Releases Wiki Activity
1,233 Commits 3 Branches 0 Tags
7dfd6406d84a8ff7b6f2f67f1f5c30d132bdce65
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robby Russell 7dfd6406d8 Merge pull request #1451 from rmcastil/modify_readme_to_clarify_the_manual_way 
Modify readme to clarify the manual way
 2012-12-02 09:43:06 -08:00
Robby Russell 31ad21398e Merge pull request #1452 from miry/github 
Fix repo for github.
 2012-12-02 09:41:51 -08:00
Robby Russell 22f827e122 Merge pull request #1393 from agate/patch-2 
Update plugins/git-flow/git-flow.plugin.zsh
 2012-12-01 12:02:35 -08:00
Robby Russell 2e55825f9c Merge pull request #1365 from pcasaretto/add-heroku-remote-switch 
Add the heroku --remote switch
 2012-12-01 11:59:21 -08:00
Robby Russell b8e230205a Merge pull request #1366 from op/last-working-dir 
Added last working directory plugin
 2012-12-01 11:59:03 -08:00
Robby Russell 9a88e76823 Merge pull request #1370 from ericmathison/syntax-fix 
Fix color syntax
 2012-12-01 11:58:21 -08:00
Robby Russell f9c1a7242f Merge pull request #1347 from paulredmond/plugin/jira 
Jira Plugin - Wrong URL ⚡
 2012-12-01 11:57:21 -08:00
Robby Russell aad58afc54 Merge pull request #1386 from sanbor/master 
Pass plugin for completion
 2012-12-01 11:44:04 -08:00
Robby Russell e3b97db493 Merge pull request #1390 from pluton8/bugfix/autojump21 
Fix sourcing brew's autojump of version 21.0.3+
 2012-12-01 11:42:19 -08:00
Robby Russell 2aa485ac04 Merge pull request #1435 from Drarok/fix-svn 
Fix backwards svn "dirty" state detection
 2012-12-01 11:41:17 -08:00
Robby Russell 3657bf8efa Merge pull request #1421 from cristim/master 
Added a small mod of the tjkirch theme
 2012-12-01 11:40:44 -08:00
Robby Russell 25a2f029a4 Merge pull request #1399 from tresni/patch-1 
Update themes/minimal.zsh-theme
 2012-12-01 11:39:54 -08:00
Robby Russell 08efdcdd16 Merge pull request #1400 from tresni/patch-2 
Updated svn.plugin.zsh to behave more like lib/git.zsh
 2012-12-01 11:39:21 -08:00
Robby Russell 66e784c8c1 Merge pull request #1416 from talmuth/master 
Add support of multiple screen variants in screen plugin
 2012-12-01 11:38:52 -08:00
Robby Russell 26d46546a6 Merge pull request #1410 from jimhester/per-directory-history 
Replace reset-prompt with push-line and accept-line
 2012-12-01 11:36:22 -08:00
Robby Russell ddb8d46e98 Merge pull request #1411 from niceview/rvm 
Use rvm completion from ~/.rvm/scripts/zsh/Completion
 2012-12-01 11:35:48 -08:00
Robby Russell f2050fc093 Merge pull request #1413 from arnihermann/master 
Implement 'gup' as git pull --rebase
 2012-12-01 11:33:40 -08:00
Robby Russell 29b66b85c8 Merge pull request #1412 from jdavis/coffee_plugin 
Added a CoffeeScript plugin.
 2012-12-01 11:33:07 -08:00
Robby Russell 5189cb8843 Merge pull request #1418 from Mehonoshin/patch-2 
Added gwc(git whatchanged alias) to git plugin
 2012-12-01 11:32:35 -08:00
Robby Russell bc1a06aab4 Merge pull request #1419 from ssrihari/master 
Alias 'rdbtp' to rake db:test:prepare to rails plugin
 2012-12-01 11:32:09 -08:00
Robby Russell 293a65c9d8 Merge pull request #1439 from maxbane/master 
Revert "Fix to restore bindings after switching to vi-mode"
 2012-12-01 11:31:21 -08:00
Robby Russell 3dc1d92950 Merge pull request #1442 from willman500/git-hub-flow-plugin 
Add autocomplete for git "hubflow"
 2012-12-01 11:30:37 -08:00
Robby Russell f69b05b03a Merge pull request #1445 from knxroot/master 
urltools more fast
 2012-12-01 11:29:55 -08:00
Robby Russell 533a281919 Merge pull request #1430 from danielsoneg/egd-update_frequency 
Add UPDATE_ZSH_DAYS setting
 2012-11-30 05:47:32 -08:00
Robby Russell 8a2314edee Merge pull request #1437 from Partyschaum/master 
Some fixes for the agnoster theme / Fixed autocompletion for autojump with homebrew
 2012-11-30 05:40:02 -08:00
Robby Russell 067178d877 Merge pull request #1446 from suzaku/patch-1 
fix typo in theme
 2012-11-30 05:37:35 -08:00
Robby Russell d750e7d9e3 Merge pull request #1426 from caarlos0/master 
fixing issue 1423
 2012-11-25 18:08:18 -08:00
Robby Russell 6fbe594238 Merge pull request #1391 from logicmd/master 
sublime text not found in Ubuntu
 2012-11-25 11:39:45 -08:00
Robby Russell 03c2712243 Merge pull request #1388 from fuadsaud/agnoster_theme_show_exit_status 
agnoster theme shows error code instead of an "x"
 2012-11-25 11:39:08 -08:00
Robby Russell aaca1c2558 Merge pull request #1395 from caarlos0/master 
added some maven love <3
 2012-11-25 11:38:54 -08:00
Robby Russell 802c2df7ba Merge pull request #1406 from chinghanho/master 
Improved statistics functions
 2012-11-25 11:37:43 -08:00
Robby Russell a5bc97f76b Merge pull request #1404 from Bklyn/master 
Fix for "?" and "!" in svn status output
 2012-11-25 11:36:46 -08:00
Robby Russell 1b4a23ac8b Merge pull request #1396 from webframp/fix/brew-autojump-zsh 
Fix for brew installed autojump
 2012-11-25 11:36:09 -08:00
Robby Russell 63cd6ef7eb Merge pull request #1415 from jmatth/git_root_pull 
Adding grt alias to the git plugin.
 2012-11-25 11:35:48 -08:00
Robby Russell fdfc0b3cd9 Merge pull request #1417 from felipec/fc-git-upstream 
Add gifast plugin
 2012-11-25 11:35:24 -08:00
Robby Russell c2ae9e09ca Merge pull request #1344 from danielcsgomes/master 
Added Composer Plugin and Symfony2 alias
 2012-10-09 06:42:27 -07:00
Robby Russell d4d2e6d659 Merge pull request #1306 from josh-/master 
New 'Nanoc' plugin
 2012-10-09 06:41:16 -07:00
Robby Russell 6d4b0c6e56 Merge pull request #1312 from koenpunt/fixes_cap_plugin 
updated cap plugin to use `cap -T` instead of `cap show_tasks`
 2012-10-09 06:40:31 -07:00
Robby Russell c5a890585b Merge pull request #1330 from trobrock/hide-rvm-prompt 
Don't show empty parens if you are using your system ruby
 2012-10-09 06:39:34 -07:00
Robby Russell 3d438617e7 Merge pull request #1333 from b4mboo/master 
Add zeus plugin
 2012-10-09 06:38:36 -07:00
Robby Russell 8a8b821aac Merge pull request #1335 from paulredmond/plugin/jira 
Open Jira issues from a project
 2012-10-09 06:37:52 -07:00
Robby Russell 9ba2ab3225 Merge pull request #1346 from ianchesal/urltools 
URL Tools Plugin
 2012-10-09 06:35:01 -07:00
Robby Russell 73f7770537 Merge pull request #1327 from agnoster/master 
BY POPULAR DEMAND... the "agnoster" theme...
 2012-09-28 22:52:19 -07:00
Robby Russell 25a9cddc21 Merge pull request #1318 from trobrock/add-puma-to-bundler 
Bundle exec puma also http://puma.io
 2012-09-23 11:48:42 -07:00
Robby Russell 8247a4097d Merge pull request #1320 from jimhester/vi-mode-patch 
Fix to restore bindings after switching to vi-mode
 2012-09-23 11:45:03 -07:00
Robby Russell 523b26c6ef Merge pull request #1321 from jimhester/per-directory-history 
Per directory history plugin
 2012-09-23 11:41:58 -07:00
Robby Russell 5f16ede7ca Merge pull request #1322 from jimhester/colemak 
Colemak plugin ( http://colemak.com/ )
 2012-09-23 11:40:14 -07:00
Robby Russell 8c2145fc85 Merge pull request #1323 from lxmonk/autojump-port 
added autojump plugin support for mac os x, when port installed autojump
 2012-09-23 11:38:46 -07:00
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