Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-20 11:45:11 +02:00
Code Issues Releases Wiki Activity
2,761 Commits 3 Branches 0 Tags
20edd5f6de221dcf4ae818c0fa91c5121afbbf0f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robby Russell 6d5d67a35d Merge pull request #3067 from tacgnol/AWS 
Fix issue with homebrew installed awscli
 2014-08-31 10:17:21 -07:00
Robby Russell e425ddc0ef Merge pull request #2766 from mcornella/add-contributing-file 
Add a CONTRIBUTING file to instruct people on issues and pull requests
 2014-08-31 10:16:28 -07:00
Robby Russell 1b7a3ea99a Merge pull request #2993 from mittalabhas1/master 
Update README.textile
 2014-08-01 10:34:55 -07:00
Robby Russell 36e1cff69a Merge pull request #2994 from admpsktt/patch-1 
Update rvm.plugin.zsh
 2014-08-01 10:32:35 -07:00
Robby Russell 207b6a1e33 Merge pull request #2969 from nicolas-brousse/patch-1 
Update brew.plugin.zsh
 2014-07-20 21:41:51 -07:00
Robby Russell cea29ff7ce Merge pull request #2914 from bezoerb/symfony2-general 
generalized symfony2 console directory
 2014-07-16 00:08:11 -07:00
Robby Russell 15c5d59892 Merge pull request #2923 from Kriechi/bundler-fixes 
Bundler fixes
 2014-07-16 00:05:19 -07:00
Robby Russell c925aabea9 Merge pull request #2885 from tsujigiri/bundler/run_binstubbed 
Make bundler plugin run binstubbed cmd if existing
 2014-07-15 07:40:48 -07:00
Robby Russell 6eefbe24a3 Merge pull request #2935 from kubamarchwicki/mvn-plugin-spring-boot 
Enable Spring-boot autocomplete
 2014-07-15 07:40:19 -07:00
Robby Russell 14439e0571 Merge pull request #2834 from jbdatko/master 
Adds itunes vol command.
 2014-07-15 07:39:10 -07:00
Robby Russell 01da53e10f Merge pull request #2828 from r3dDoX/master 
removed a hardcoded 'origin' in git.zsh and added new function for number of commits ahead of remote
 2014-07-15 07:38:55 -07:00
Robby Russell 9f8c5d0021 Merge pull request #2745 from nicolas-brousse/patch-1 
Add alias for "brew update && brew upgrade"
 2014-07-15 07:37:22 -07:00
Robby Russell decc0d1d36 Merge pull request #2670 from trrbl/master 
Add Ruby 2.1.1 support to rvm plugin
 2014-07-15 07:36:59 -07:00
Robby Russell 4a36bb144b Merge pull request #2108 from rimenes/add-status-reload-to-postgres 
Add reload and status aliases to postgres
 2014-07-15 07:36:33 -07:00
Robby Russell f9bb10d161 Merge pull request #2940 from hayd/status_code 
terminal party show exit status with color
 2014-07-15 07:34:23 -07:00
Robby Russell 7e8177b094 Merge pull request #2953 from jjcomer/master 
Fix typo in docker plugin
 2014-07-15 07:31:32 -07:00
Robby Russell 18eb1939fe Merge pull request #2955 from SFrost007/jira-prefix 
Add support for jira-prefix configuration file
 2014-07-15 07:30:35 -07:00
Robby Russell 2faba65652 Merge pull request #2956 from SFrost007/wd-typo-fix 
Fix typo in warp directory plugin
 2014-07-15 07:29:20 -07:00
Robby Russell 5728a5608d Merge pull request #2892 from willmendesneto/dev 
Add new plugin: "frontend-search"
 2014-07-01 09:31:22 -07:00
Robby Russell 4131a59d1a Merge pull request #2827 from ncanceill/easymerge 
...you folks are amazing. :-)

"Easy-to-merge"
 2014-06-30 21:00:53 -07:00
Robby Russell 3913106b2e Merge pull request #2787 from irnnr/plugin-vagrant 
Support new Vagrant commands
 2014-05-16 09:33:23 -07:00
Robby Russell eafd5f3252 Merge pull request #1635 from jimhester/per-directory-history 
Update to latest per-directory-history
 2014-04-19 12:56:21 -07:00
Robby Russell 11bf1a3a29 Merge pull request #2681 from mcornella/fix-zsh_reload-plugin 
Various fixes on zsh_reload plugin
 2014-04-19 12:55:56 -07:00
Robby Russell 4509228c53 Merge pull request #2728 from benwong/patch-2 
Spelling correction in itunes control function.
 2014-04-19 12:55:30 -07:00
Robby Russell 59de9aaa65 Merge pull request #2671 from ukrutt/master 
Correct redirection of stderr
 2014-04-19 12:55:09 -07:00
Robby Russell 01dcf51fdf Merge pull request #2502 from UniIsland/patch-1 
`fc -l 1` instead of `history` in zsh_stats, fixes #2501
 2014-04-19 12:54:35 -07:00
Robby Russell 5eb5f7138a Merge pull request #2511 from FloFra/master 
Makes history-substring-search use term specific up and down buttons.
 2014-04-19 12:54:10 -07:00
Robby Russell 8aa6e6a412 Merge pull request #2650 from kemko/patch-1 
don't add --exclude-dir to GREP_OPTIONS on FreeBSD
 2014-04-19 12:53:42 -07:00
Robby Russell ee31abfb2d Merge pull request #2729 from grodzik/master 
Fix for Python3
 2014-04-19 07:15:04 -07:00
Robby Russell 3b830aac8c Merge pull request #2693 from javiertejero/master 
Fix `docker rmi` tab completion
 2014-04-19 07:14:39 -07:00
Robby Russell a9061f34d7 Merge pull request #2633 from redsunsoft/agnoster-theme-git-mode-addition 
Added git support for merging, rebasing, and bisecting to agnoster theme
 2014-04-17 19:57:23 -07:00
Robby Russell f8f01262ab Merge pull request #2685 from delynn/patch-2 
Remove mailcatcher from bundler plugin
 2014-04-05 08:01:29 -07:00
Robby Russell 00d6ef8a31 Merge pull request #2329 from pstadler/brew-cask 
add brew-cask plugin
 2014-03-31 07:57:25 -07:00
Robby Russell 70dfb91b98 Merge pull request #2663 from bobmaerten/docker-autocomplete-updates 
Docker autocomplete plugin is not up to date with recent versions.
 2014-03-27 21:33:49 -07:00
Robby Russell fe73f8d5b1 Merge pull request #2651 from jehrhardt/fix-emacs 
Fix Emacs plugin
 2014-03-27 21:32:58 -07:00
Robby Russell 175310ae27 Merge pull request #2661 from mcornella/fix_title_tab_percent 
Fix escaping of $CMD of automatic title
 2014-03-27 21:31:04 -07:00
Robby Russell ae0c6507e4 Merge pull request #2659 from simonc/allowing-pow-path-with-spaces 
Allowing path with spaces in pow plugin
 2014-03-27 21:30:38 -07:00
Robby Russell 861d380aa3 Merge pull request #2658 from leifcr/rake-fast-issue 
Plugin: Rake-fast: Support both *nix and Darwin
 2014-03-27 21:29:36 -07:00
Robby Russell 27c28a94af Merge pull request #2647 from bobwilliams/master 
Adding a README.md for plugins/jsontools
 2014-03-27 21:22:03 -07:00
Robby Russell 78967b604d Merge pull request #2656 from philenotfound/master 
New aliases for 'apt-get' and 'aptitude' as they were overwritten by lat...
 2014-03-27 21:21:24 -07:00
Robby Russell a6b9597373 Merge pull request #2652 from lukehorvat/patch-1 
Fixed typos + made wording more consistent in zshrc.zsh-template
 2014-03-27 21:19:42 -07:00
Robby Russell a5f6f72b66 Merge pull request #2660 from KevinBongart/add-readme-to-rake-fast 
Add README file to rake-fast plugin
 2014-03-27 21:18:28 -07:00
Robby Russell 9c1241a680 Merge pull request #2662 from aeriksson/master 
Fix broken reverse-menu-complete keybinding.
 2014-03-27 21:18:02 -07:00
Robby Russell ffc17b6b4d Merge pull request #2563 from bobwilliams/master 
Adds command line aliases useful for dealing with JSON
 2014-03-23 11:40:46 -07:00
Robby Russell 27965fedec Merge pull request #2390 from LFDM/updating_spectrum 
Updates and refactors spectrum.zsh
 2014-03-23 11:39:07 -07:00
Robby Russell 47ad2424cd Merge pull request #2645 from ncanceill/template-zshrc 
Improve template zshrc
 2014-03-23 11:38:29 -07:00
Robby Russell 315099d778 Merge pull request #2643 from mcornella/patch-1 
Fix export syntax of $GREP_OPTIONS
 2014-03-22 19:10:56 -07:00
Robby Russell 178b5224e8 Merge pull request #1302 from cybozuty/master 
Vagrant plugin: Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details.
 2014-03-22 16:22:34 -07:00
Robby Russell c4727ab558 Merge pull request #1262 from fred-o/glassfish-plugin 
Glassfish plugin
 2014-03-22 16:19:37 -07:00
Robby Russell 393c805f7e Merge pull request #1162 from nXqd/patch-1 
avoid VCS folders
 2014-03-22 16:07:51 -07:00
Robby Russell 668886e203 Merge pull request #1117 from Peeja/move-example-plugin 
Move example plugin to the custom plugins directory.
 2014-03-22 15:58:00 -07:00
Robby Russell 5540daf4a2 Merge pull request #967 from wjlroe/pip-requirements 
Add completion for pip install -r - so that it autocompletes requirement...
 2014-03-22 15:55:44 -07:00
Robby Russell 75504364ed Merge pull request #1022 from derekwyatt/master 
A plugin that makes it easier to interact with the (single) running instance of gvim
 2014-03-22 15:44:11 -07:00
Robby Russell ae1f331782 Merge pull request #1005 from cmar/powed 
pow plugin - commands to restart pow and list urls
 2014-03-22 15:41:46 -07:00
Robby Russell ae1a9e25a1 Merge pull request #995 from wting/fix_gnzh_ruby_detection 
Fix gnzh theme to detect local rvm installations
 2014-03-22 15:40:00 -07:00
Robby Russell fff49ae523 Merge pull request #990 from tommorris/master 
README should have link to wiki for plugins
 2014-03-22 15:38:47 -07:00
Robby Russell d4e907bf14 Merge pull request #973 from dlee/gem_build 
Add gem build autocompletion
 2014-03-22 15:36:52 -07:00
Robby Russell 9eacd7d589 Merge pull request #750 from blueyed/history-drop-default-append-history 
`setopt append_history` is not necessary.
 2014-03-22 13:59:19 -07:00
Robby Russell d41c588d1b Merge pull request #672 from eMxyzptlk/zsh_reload 
Add zsh_reload which provides src function, this function will source .zshrc and rebuilds cache
 2014-03-22 13:56:03 -07:00
Robby Russell d8a5fff1a7 Merge pull request #662 from walle/add_autocomplete_for_gas 
Update the script to account for the changes in 0.1.7 where .gas is a dir
 2014-03-22 13:55:33 -07:00