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
2,903 Commits 3 Branches 0 Tags
fd3a34844f649b2be21fe4e5504a2cf086d1340b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robby Russell c78277fd8b Merge pull request #3429 from apjanke/termsupport-apple-chpwd 
termsupport: add chpwd hook for setting pwd in Apple Terminal.app
 2015-01-09 02:45:12 -06:00
Robby Russell 175b4a8073 Merge pull request #3407 from rawberg/mira-theme 
mira theme shows active node, ruby and java versions
 2014-12-20 12:41:25 -08:00
Robby Russell da1ca8876e Merge pull request #3404 from ekaragodin/master 
Added Yii2 command completion
 2014-12-20 12:40:47 -08:00
Robby Russell 0c47d8cfe4 Merge pull request #3146 from typekpb/tmux-aliases 
additional tmux aliases
 2014-12-20 12:38:43 -08:00
Robby Russell 304e8f0480 Merge pull request #3338 from eripa/chruby_fix 
Fix chruby plugin to not complain if chruby is *not* installed
 2014-12-20 12:37:18 -08:00
Robby Russell b0ad3d7c70 Merge pull request #3352 from benjaoming/virtualenvwrapper_workon_unset 
Throw an error message when $WORKON_HOME is not set
 2014-12-20 12:37:05 -08:00
Robby Russell fe2ccb30af Merge pull request #3397 from peteches/master 
Fixed output issues webith websearch plugin.
 2014-12-20 12:36:27 -08:00
Robby Russell c63f27a9f2 Merge pull request #3412 from mcornella/feltnerm-patch-1 
Disable sourcing .profile when checking for available updates
 2014-12-19 20:31:49 -08:00
Robby Russell 5167450ef9 Merge pull request #3424 from bergvandenp/docker_exec 
added exec command to docker plugin
 2014-12-19 20:30:59 -08:00
Robby Russell 4a56c6b30b Merge pull request #3303 from iml/brew-update 
Remove deprecated brew commands, update core commands
 2014-12-19 20:27:54 -08:00
Robby Russell 1b2d7fd9e9 Merge pull request #3362 from emarashliev/master 
Added Xcode alias for deleting Derived Data.
 2014-12-19 20:26:50 -08:00
Robby Russell dc9af89669 Merge pull request #3372 from bbiao/compatible-with-new-autojump 
autojump installed from github has mv the autojump.zsh to $HOME/.autojum...
 2014-12-19 20:26:08 -08:00
Robby Russell 9b352030b7 Merge pull request #3409 from unixorn/prevent-variable-clobbering 
Add quoting to nvm.sh
 2014-12-19 20:21:33 -08:00
Robby Russell 9e794a5d3e Merge pull request #3410 from Superbil/master 
Fix aws.plugins.zsh check rule
 2014-12-19 20:20:21 -08:00
Robby Russell cd845a1ffd Merge pull request #3417 from stof/patch-1 
Update the list of Heroku Postgres commands
 2014-12-19 20:19:26 -08:00
Robby Russell 1978a0923c Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this 2014-12-15 08:11:04 -08:00
Robby Russell 0a96bb1577 Merge pull request #2094 from frantzmiccoli/phing-fix 
Phing plugin improvment
 2014-12-14 16:44:06 -08:00
Robby Russell fe75c968ef Merge pull request #3399 from ryan-robeson/add-itunes-shuffle-command-to-osx-plugin 
Add itunes shuffle command to OSX plugin.
 2014-12-14 16:35:45 -08:00
Robby Russell 77bfdc69ab Merge pull request #3395 from vmalloc/patch-1 
Fix dircycle plugin
 2014-12-14 16:35:02 -08:00
Robby Russell 07c013c671 Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repoz 
add current bookmark to rkj-repos theme
 2014-12-14 16:34:49 -08:00
Robby Russell 885e8187ad Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehist 
Don't clobber $HISTSIZE and $SAVEHIST
 2014-12-14 16:34:08 -08:00
Robby Russell eced76e0fd Merge pull request #3326 from DanielFGray/master 
ignore any grep aliases that might be defined
 2014-12-14 16:32:11 -08:00
Robby Russell 311f3630d4 Merge pull request #3403 from mcornella/fix-grep-library 
Fix grep.zsh library
 2014-12-14 16:31:54 -08:00
Robby Russell 8efdbef778 Merge pull request #3366 from ratza/master 
Fix for command autocomplete for Symfony 2.6.x
 2014-12-14 16:28:18 -08:00
Robby Russell 141c2e5934 Merge pull request #3344 from wrboyce/custom-lib 
allow overriding lib/*.zsh in custom/lib
 2014-12-12 17:45:09 -08:00
Robby Russell 43aa3783f8 Merge pull request #2448 from gawashburn/master 
Fix autojump script to support Nix installations
 2014-11-27 20:03:06 -08:00
Robby Russell 5acfdf5c90 Merge pull request #2871 from wrboyce/extract-pigz 
use pigz if available in extract plugin
 2014-11-27 20:02:40 -08:00
Robby Russell 4610add16d Merge pull request #3092 from MWers/aws-brew-issue 
[aws plugin] Changed brew cmd to properly report if awscli is installed via homebrew
 2014-11-27 20:02:08 -08:00
Robby Russell 4c4f47a758 Merge pull request #3265 from thii/fix-yosemite-broken 
Fix Yosemite broken zsh
 2014-11-27 20:01:43 -08:00
Robby Russell 60a41a866a Merge pull request #3283 from jaapz/master 
Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
 2014-11-27 20:01:28 -08:00
Robby Russell 9f4dfc0a23 Merge pull request #3309 from jarinudom/superjarin 
Simplify superjarin theme and support chruby
 2014-11-27 20:00:56 -08:00
Robby Russell 0222e77497 Merge pull request #3333 from mcornella/fix-git-hide-dirty 
Switch back to oh-my-zsh.hide-dirty setting again
 2014-11-19 12:41:12 -08:00
Robby Russell 6a496d2cca Merge pull request #3323 from alfss/fix-pj 
[~] fix plugin pj
 2014-11-19 12:40:59 -08:00
Robby Russell df5b09e20b Merge pull request #3299 from apoxa/fix-profiles 
Fix for the profile plugin.
 2014-11-07 07:47:33 -08:00
Robby Russell 7f75bb90e3 Merge pull request #3223 from mcornella/use-special-vars 
Use special variables where we can
 2014-11-06 10:42:38 -08:00
Robby Russell 7034b01cd1 Merge pull request #3213 from nikhgupta/features/fix-emoji-clock 
added support for GNU version of `date`
 2014-11-06 09:28:30 -08:00
Robby Russell 8a51bfd76b Merge pull request #3108 from mfaerevaag/master 
[wd] New minor version (v0.4)
 2014-11-06 09:28:08 -08:00
Robby Russell 35f1a23735 Merge pull request #3131 from halilim/remove-j-alias 
Remove j alias for autojump
 2014-11-06 09:27:56 -08:00
Robby Russell 510055a03a Merge pull request #3081 from pavoljuhas/master 
update the scd plugin for smart change of directory.
 2014-11-06 09:27:43 -08:00
Robby Russell 6118446575 Merge pull request #2974 from elliottwilliams/patch-1 
Fix osx function: "not valid in this context"
 2014-11-06 09:27:16 -08:00
Robby Russell e423ca04c8 Merge pull request #2976 from shammellee/patch-1 
typo
 2014-11-06 09:26:56 -08:00
Robby Russell 57ff83db59 Merge pull request #2946 from moinakg/master 
Solaris portability tweaks.
 2014-11-06 09:26:48 -08:00
Robby Russell 0f7e5e41b8 Merge branch 'simonbuchan-master' 2014-11-06 09:24:18 -08:00
Robby Russell 81004dfaba 2928 merge conflict 2014-11-06 09:24:00 -08:00
Robby Russell 1b65c55fcf Merge pull request #2959 from crkochan/fix_rake_command 
Fix for recusion limit hit for _rake_command alias
 2014-11-06 09:19:49 -08:00
Robby Russell 4eff7926b3 Merge pull request #2648 from dfarrell07/master 
Fixed which output at each new shell creation
 2014-11-06 09:19:20 -08:00
Robby Russell 160abc9a8d Merge pull request #2323 from michaelorr/slow-git-fix 
Renaming config for parse_git_dirty() to avoid collision
 2014-11-06 09:15:00 -08:00
Robby Russell 2984d2dc4b Merge pull request #2168 from riyad/modernize-virtualenv 
Modernize the virtualenv plugin
 2014-11-06 09:14:17 -08:00
Robby Russell ed01122804 Merge pull request #1604 from franklouwers/master 
Improve pj-plugin to support projects with spaces in their names + optimise code
 2014-11-06 09:13:56 -08:00
Robby Russell 548b9c447d Merge pull request #3224 from Neal/xcode-simulator-fix 
Update path for the iOS simulator.
 2014-11-06 09:13:40 -08:00
Robby Russell ba6bf248b4 Merge pull request #3230 from willmendesneto/fix-compass-doc-search 
Fix error using compass search alias
 2014-11-06 09:13:24 -08:00
Robby Russell c0905fd82c Merge pull request #3226 from mcornella/fix-plugin-gitignore 
[Plugin: gitignore] Several fixes in the plugin
 2014-11-06 09:12:27 -08:00
Robby Russell 7f07facf41 Merge pull request #3252 from mcornella/fix-auto-named-dirs-prompt 
Don't set auto_name_dirs because it messes up prompts
 2014-10-22 08:00:49 -07:00
Robby Russell 96e4e5dd03 Merge pull request #2811 from stucki/multiple-vagrant-machines 
Support dynamically defined Vagrant machines
 2014-09-05 21:16:23 +02:00
Robby Russell 4bba11dbef Merge pull request #2744 from docwhat/ostype-not-uname 
Use $OSTYPE instead of uname to speed things up
 2014-09-05 21:15:57 +02:00
Robby Russell ffe8ce5b1e Merge pull request #3095 from robbyrussell/revert-1504-master 
Revert "Exit early from git plugin if not in git repo." due to #3082
 2014-09-04 12:54:55 +02:00
Robby Russell 5e25913178 Revert "Exit early from git plugin if not in git repo." 2014-09-04 12:53:43 +02:00
Robby Russell a8ef111a79 Merge pull request #3072 from clippit/patch-1 
Fix missing add-zsh-hook in pygmalion.zsh-theme
 2014-09-03 15:51:50 +02:00
Robby Russell dd644a1fa9 Merge pull request #2743 from docwhat/issue-2155-scutil 
Trust but verify 'scutil' to return ComputerName
 2014-09-03 15:51:30 +02:00
Robby Russell ca0331da51 Merge pull request #3087 from hacfi/symfony 
Symfony2 plugin use first console found
 2014-09-03 15:49:04 +02:00
Robby Russell da94f45f9c Merge pull request #3073 from ajhenriques/master 
add git difftool alias (gdt)
 2014-09-01 13:02:55 +02:00
Robby Russell d21e3ee422 Merge pull request #2996 from joshmedeski/master 
WP-CLI plugin init
 2014-09-01 13:02:34 +02:00
Robby Russell eca6dca2a1 Merge pull request #3071 from halilim/patch-4 
Use the library function for ruby prompt
 2014-09-01 13:02:12 +02:00
Robby Russell 003f3677db Merge pull request #3070 from stucki/vagrant-vm-list-fix 
Improve support for Vagrant VM definitions
 2014-09-01 13:01:36 +02:00
Robby Russell a796a67c8f Merge pull request #3077 from robbyrussell/revert-3068-patch-1 
Revert "Add Composer's local binaries to PATH"
 2014-09-01 13:01:06 +02:00
Robby Russell a910aef0c4 Revert "Add Composer's local binaries to PATH" 2014-09-01 13:01:01 +02:00
Robby Russell 7a531666dc Merge pull request #3076 from robbyrussell/revert-2766-add-contributing-file 
Revert "Add a CONTRIBUTING file to instruct people on issues and pull re...
 2014-09-01 13:00:06 +02:00
Robby Russell 39fb6c9d35 Revert "Add a CONTRIBUTING file to instruct people on issues and pull requests" 2014-09-01 12:59:47 +02:00
Robby Russell fdba0f43f5 Merge pull request #3069 from johnjohndoe/feature/adb-autocompletion 
Add README.md for adb-autocompletion plugin.
 2014-09-01 12:59:17 +02:00
Robby Russell 23bbf3cc2b Merge pull request #2986 from Guerki/master 
Run web-search in background
 2014-08-31 12:16:38 -07:00
Robby Russell 6cb8b720b3 Merge pull request #2995 from admpsktt/patch-2 
Update README.textile
 2014-08-31 12:14:16 -07:00
Robby Russell 56d9acfbaf Merge pull request #3044 from alexshd/patch-1 
Resets the font colour to original
 2014-08-31 12:11:05 -07:00
Robby Russell 99fde07b8f Merge pull request #3000 from bigtiger/add-git-add-patch 
Add gap (git add --patch)
 2014-08-31 12:10:04 -07:00
Robby Russell 1f9b24e56b Merge pull request #2997 from cchacin/master 
TomEE maven plugin + integration-test in common life-cycle
 2014-08-31 12:08:08 -07:00
Robby Russell 4438acb3f1 Merge pull request #3004 from admpsktt/patch-3 
Update half-life.zsh-theme
 2014-08-31 12:06:13 -07:00
Robby Russell eae6c38ea8 Merge pull request #3010 from celsomiranda/patch-1 
Add support for local aur databases
 2014-08-31 11:46:07 -07:00
Robby Russell 244a6f23e5 Merge pull request #3011 from cherrry/master 
rounding to emoji clock
 2014-08-31 11:45:10 -07:00
Robby Russell 58491bda21 Merge pull request #3012 from abstractj/git-gpg-signatures 
Inclusion of aliases for sign git commits and tags
 2014-08-31 11:44:57 -07:00
Robby Russell 74e7510a7d Merge pull request #3014 from allister-lundberg/git_alias_gitbranchremote 
New alias for git plugin: gbr == git branch --remote
 2014-08-31 11:43:59 -07:00
Robby Russell c1cd9cb126 Merge pull request #3049 from strycore/master 
Prevent chsh from running when $SHELL is already zsh
 2014-08-31 11:42:40 -07:00
Robby Russell fc365f5bdc Merge pull request #2963 from bezoerb/symfony2-autocomplete-fix 
#2914 fixed symfony2 autocomplete
 2014-08-31 11:36:08 -07:00
Robby Russell 5e842cf4f1 Merge pull request #3041 from takac/master 
Update jira plugin to allow lookup of issues
 2014-08-31 11:34:12 -07:00
Robby Russell 6908827035 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2014-08-31 11:32:21 -07:00
Robby Russell 671bd0cf4f Link to swag in installer... shameless profiting 2014-08-31 11:32:07 -07:00
Robby Russell 9f8d7d85c2 Adding link to the store for swag in upgrade process 2014-08-31 11:30:30 -07:00
Robby Russell c22658e15d Merge pull request #3059 from chrisfsmith/feature/bbedit 
Adding BBEdit plugin (OS X only)
 2014-08-31 11:26:14 -07:00
Robby Russell b88d68279e Merge pull request #3060 from chrisfsmith/feature/marked 
Adding Marked 2 plugin (OS X only)
 2014-08-31 11:25:58 -07:00
Robby Russell 3577fba612 Merge pull request #3058 from chrisfsmith/feature/textastic 
Adding Textastic plugin (OS X only)
 2014-08-31 11:25:29 -07:00
Robby Russell c207c83968 Merge pull request #1755 from johnjohndoe/feature/adb-autocompletion 
Add autocompletion for adb
 2014-08-31 11:04:55 -07:00
Robby Russell c07bf981c3 Merge pull request #1504 from jediant/master 
Exit early from git plugin if not in git repo.
 2014-08-31 10:59:55 -07:00
Robby Russell 6caed46356 Merge pull request #2941 from mcornella/fix-pass-completion 
Update pass completion and fix syntax and autoloading
 2014-08-31 10:55:35 -07:00
Robby Russell 3e30b4d2d1 Merge pull request #2922 from ncanceill/easymerge 
Easy-to-Merge via @ncanceill... our hero!
 2014-08-31 10:46:31 -07:00
Robby Russell fcd55f3a92 Merge pull request #2845 from mfaerevaag/master 
[wd] New minor release
 2014-08-31 10:45:40 -07:00
Robby Russell 958c8f4390 Merge pull request #3045 from fornwall/remove-usr-bin 
Replace /usr/bin/env with env
 2014-08-31 10:40:19 -07:00
Robby Russell be578d9e7a Merge pull request #3053 from jingweno/patch-1 
Fix missing add-zsh-hook
 2014-08-31 10:39:03 -07:00
Robby Russell a5cbd31074 Merge pull request #3065 from posva/tmuxinator-update 
Update tmuxinator autocompletion
 2014-08-31 10:38:31 -07:00
Robby Russell 686f29f07d Merge pull request #3052 from DariusPHP/master 
#git plugin git diff-tree --name-only added
 2014-08-31 10:28:28 -07:00
Robby Russell a1c5abf6bf Merge pull request #3055 from sachin21/remove_alias 
This alias is conflict cause.
 2014-08-31 10:25:34 -07:00
Robby Russell 4641130357 Merge pull request #3068 from nervo/patch-1 
Add Composer's local binaries to PATH
 2014-08-31 10:23:28 -07:00
Robby Russell b43e8ab723 Merge pull request #3057 from igorzoriy/master 
Added 'uninstall' command to brew completion
 2014-08-31 10:18:30 -07:00